Author -> Maintainer

Makefile

@@ -98,12 +98,10 @@ endif
 	@echo "$(VERSION)"
 
 # Get the project author.
- getauthor:
-	@echo "$(AUTHOR_NAME) <$(AUTHOR_MAIL)>"
- getauthor_name:
-	@echo "$(AUTHOR_NAME)"
+ getmaintainer:
+	@echo "$(MAINTAINER_NAME) <$(MAINTAINER_MAIL)>"
 
-.PHONY: getname getauthor getauthor_name getversion
+.PHONY: getname getmaintainer getversion
 #******************************************************************************#
 # Binaries-specific targets                                                    #
 #******************************************************************************#

Makefile.vars

@@ -18,8 +18,8 @@
  LIBS := libp7 sdl
 
 # Author information.
- AUTHOR_NAME := Thomas \"Cakeisalie5\" Touhey
- AUTHOR_MAIL := thomas@touhey.fr
+ MAINTAINER_NAME := Thomas \"Cakeisalie5\" Touhey
+ MAINTAINER_MAIL := thomas@touhey.fr
 
 # Project license.
  LICENSE := GPLv2
@@ -60,9 +60,8 @@
 # - More flags (profiling, ...)
 #CMOREFLAGS :=
 # - All C Compiler flags
- CFLAGS := $(CWARN) -std=gnu11 -O2 \
-	-D LICENSE="$(LICENSE)" -D VERSION="$(VERSION)" \
-	-D AUTHOR="$(AUTHOR_NAME) <$(AUTHOR_MAIL)>" \
+ CFLAGS := $(CWARN) -std=gnu11 -O2 -D VERSION="$(VERSION)" \
+	-D MAINTAINER="$(MAINTAINER_NAME) <$(MAINTAINER_MAIL)>" \
 	-D DEFAULT_STORAGE="$(DEFAULT_STORAGE)" \
 	-D DEFAULT_ZOOM="$(DEFAULT_ZOOM)" \
 	$(shell $(PKGCONFIG) --cflags $(LIBS) 2>/dev/null) \

configure

@@ -7,9 +7,8 @@ cd "$(dirname "$0")"
 name="$(make -s getname)"
 version="$(make -s getversion)"
 
-# Author
-author="$(make -s getauthor)"
-author_name="$(make -s getauthor_name)"
+# Maintainer
+maintainer="$(make -s getmaintainer)"
 
 # Target
 target=""
@@ -61,7 +60,7 @@ Fine tuning of the installation directories:
   --bindir=DIR              user executables, not "dustbin" [$bindir]
   --mandir=DIR              man root [$mandir]
 
-Report bugs to ${author}.
+Report bugs to ${maintainer}.
 EOF
 exit 0
 }
@@ -72,7 +71,7 @@ exit 0
 version() {
 cat <<EOF
 ${name} configure script v${version}
-Hand-written by ${author_name}.
+Hand-written by Thomas "Cakeisalie5" Touhey.
 
 This configure script is free software.
 There is NO warranty; not even for MERCHANTABILITY or

src/p7/args.c

@@ -19,9 +19,8 @@
 /* ************************************************************************** */
 /* Version message */
 static const char version_message[] =
-"p7 - from p7utils v" QUOTE(VERSION)
-	" (licensed under " QUOTE(LICENSE) ")\n"
-"Made by " QUOTE(AUTHOR) ".\n"
+"p7 - from p7utils v" QUOTE(VERSION) " (licensed under GPLv2)\n"
+"Maintained by " QUOTE(MAINTAINER) ".\n"
 "\n"
 "This is free software; see the source for copying conditions.\n"
 "There is NO warranty; not even for MERCHANTABILITY or\n"
@@ -55,7 +54,7 @@ static const char help_main[] =
 "                    when --no-exit was used last time p7 was called).\n"
 "\n"
 "Type \"p7 <subcommand> --help\" for some help about the subcommand.\n"
-"Report bugs to " QUOTE(AUTHOR) ".";
+"Report bugs to " QUOTE(MAINTAINER) ".";
 
 /* Sending help message */
 static const char help_send[] =

src/p7os/args.c

@@ -18,9 +18,8 @@
 /* ************************************************************************** */
 /* The version message - that's when the President comes in */
 static const char version_message[] =
-"p7os - from p7utils v" QUOTE(VERSION)
-	" (licensed under " QUOTE(LICENSE) ")\n"
-"Made by " QUOTE(AUTHOR) ".\n"
+"p7os - from p7utils v" QUOTE(VERSION) " (licensed under GPLv2)\n"
+"Maintained by " QUOTE(MAINTAINER) ".\n"
 "\n"
 "This is free software; see the source for copying conditions.\n"
 "There is NO warranty; not even for MERCHANTABILITY or\n"
@@ -45,7 +44,7 @@ static const char help_main[] =
 "                    By default, will use the first appropriate device found.\n"
 "\n"
 "Type \"p7os <subcommand> --help\" for some help about a subcommand.\n"
-"Report bugs to " QUOTE(AUTHOR) ".";
+"Report bugs to " QUOTE(MAINTAINER) ".";
 
 /* Help message for prepare subcommand  */
 static const char help_prepare[] =

src/p7screen/args.c

@@ -16,9 +16,8 @@
 /* ************************************************************************** */
 /* Version message */
 static const char version_message[] =
-"p7screen - from p7utils v" QUOTE(VERSION)
-	" (licensed under " QUOTE(LICENSE) ")\n"
-"Made by " QUOTE(AUTHOR) ".\n"
+"p7screen - from p7utils v" QUOTE(VERSION) " (licensed under GPLv2)\n"
+"Maintained by " QUOTE(MAINTAINER) ".\n"
 "\n"
 "This is free software; see the source for copying conditions.\n"
 "There is NO warranty; not even for MERCHANTABILITY or\n"
@@ -39,7 +38,7 @@ static const char help_main[] =
 "  -z ZOOM        Change the zoom (1 to 16)\n"
 "                 By default, the zoom will be " QUOTE(DEFAULT_ZOOM) ".\n"
 "\n"
-"Report bugs to " QUOTE(AUTHOR) ".";
+"Report bugs to " QUOTE(MAINTAINER) ".";
 
 /* ************************************************************************** */
 /*  Main function                                                             */