Major restructuring to switch build system from old scripts to GNU Automake.

src/main/help.c

@@ -424,7 +424,7 @@ void display_help(void)
 	 * be hard to exploit - the message catalogue would have to be
 	 * replaced or forced to load from another location.
 	 */
-	printf(_("Usage: %s [OPTION] [FILE]..."), PROGRAM_NAME);
+	printf(_("Usage: %s [OPTION] [FILE]..."), PACKAGE_NAME);
 	/*@+formatconst@ */
 
 	printf("\n");
@@ -579,7 +579,7 @@ void display_help(void)
 		 * splint note: see earlier "formatconst" note.
 		 * flawfinder: same reason.
 		 */
-		printf(bug_report_note, BUG_REPORTS_TO);	/* flawfinder: ignore */
+		printf(bug_report_note, PACKAGE_BUGREPORT);	/* flawfinder: ignore */
 		/*@+formatconst@ */
 	}
 

src/main/options.c

@@ -8,9 +8,7 @@
 
 #include "config.h"
 #include "options.h"
-#include "library/getopt.h"
 #include "pv.h"
-#include "pv-internal.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -18,6 +16,9 @@
 #include <errno.h>
 #include <sys/stat.h>
 #include <unistd.h>
+#ifdef HAVE_GETOPT_H
+#include <getopt.h>
+#endif
 
 
 void display_help(void);

src/main/version.c

@@ -21,15 +21,15 @@ void display_version(void)
 	 * fact we only translate each string once.
 	 */
 	/* GNU standard first line format: program and version only */
-	printf("%s %s\n", PROGRAM_NAME, VERSION);
+	printf("%s %s\n", PACKAGE_NAME, PACKAGE_VERSION);
 	/* GNU standard second line format - "Copyright" always in English */
-	printf("Copyright %s %s\n", COPYRIGHT_YEAR, COPYRIGHT_HOLDER);
+	printf("Copyright %s %s\n", "2023", "Andrew Wood");
 	/* GNU standard license line and free software notice */
 	printf("%s\n", _("License: Artistic v2.0 <https://opensource.org/license/artistic-2-0/>"));
 	printf("%s\n", _("This is free software: you are free to change and redistribute it."));
 	printf("%s\n", _("There is NO WARRANTY, to the extent permitted by law."));
 	/* Project web site link */
-	printf("\n%s: <%s>\n", _("Project web site"), PROJECT_HOMEPAGE);
+	printf("\n%s: <%s>\n", _("Project web site"), PACKAGE_URL);
 }
 
 /* EOF */