From 2d943d3d2e5b69d6b635314a46d20e55cfbd255a Mon Sep 17 00:00:00 2001 From: Paul Smith Date: Sun, 16 Oct 2022 15:13:41 -0400 Subject: Remove template files to simplify distribution creation The README templates were not useful since the replacement step didn't have anything to replace: rename them. Rather than creating template files for the config variants, create mkconfig.h.in containg PACKAGE_* variables to be replaced, and have config variant header files include it. Note on POSIX we don't use this, and continue to generate a single config.h.in file. Use config.status to convert the README.in and mkconfig.h.in files during distribution creation. Modify all users of VERSION to use PACKAGE_VERSION instead. * configure.ac: Use GNU Make not GNU make as the package name. * README.in: Use GNU Make not GNU make. * README.git: Remove references to README.W32.template. * .gitignore: Update for new behavior. * Basic.mk.template: Remove unused posix_SOURCES and VERSION, and references to unshipped mk/Posix.mk * Makefile.am: Add src/mkconfig.h as an extra dist file. * bootstrap.bat: Rewrite mkconfig.h.in to mkconfig.h * maintMakefile: Remove obsolete template files; add mkconfig.h.in. * prepare_vms.com: Rewrite mkconfig.h.in to mkconfig.h * mk/VMS.mk: Fix incorrect header file prerequisite. * src/mkconfig.h.in: New file containing PACKAGE variables. * src/config.ami: Include mkconfig.h. * src/config.h.W32: Ditto. * src/configh.dos: Ditto. * src/config.h-vms: Ditto. * src/version.c: Use PACKAGE_VERSION not VERSION. --- README.git | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'README.git') diff --git a/README.git b/README.git index 96064dc4..ae6d3a97 100644 --- a/README.git +++ b/README.git @@ -163,17 +163,16 @@ NOTE! This method builds GNU make in "maintainer mode". Make programs built Building From Git for Windows ----------------------------- -If you have a UNIX emulation like CYGWIN you can opt to run the general -build procedure above; it will work. Consult README.W32.template for -information on options you might want to use when running ./configure. +If you have a UNIX emulation like CYGWIN you can opt to run the general build +procedure above; it will work. Consult README.W32 for information on options +you might want to use when running ./configure. If you can't or don't want to do that, then first run the .\bootstrap.bat -script to prime your Git workspace: +script to "prime" your Git workspace: > .\bootstrap.bat -Next, rename the file README.W32.template to README.W32 and follow those -instructions. +Next, follow the instructions in the README.W32 file. Note, neither of these methods are tested regularly by the GNU make maintainers. Building for Windows from a distribution tarball IS tested -- cgit v1.2.1