diff options
| author | Paul Smith <psmith@gnu.org> | 2022-10-16 15:13:41 -0400 |
|---|---|---|
| committer | Paul Smith <psmith@gnu.org> | 2022-10-18 14:20:44 -0400 |
| commit | 2d943d3d2e5b69d6b635314a46d20e55cfbd255a (patch) | |
| tree | eb272d7661251ee0aecdf5357519c734110cbea1 /Makefile.am | |
| parent | b16913a67e1d0f651293d24f10ccca54a8cc0d08 (diff) | |
| download | make-git-2d943d3d2e5b69d6b635314a46d20e55cfbd255a.tar.gz | |
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.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 70b2359c..6dacc648 100644 --- a/Makefile.am +++ b/Makefile.am @@ -112,7 +112,7 @@ test_FILES = tests/run_make_tests tests/run_make_tests.bat \ # test/scripts are added via dist-hook below. EXTRA_DIST = ChangeLog INSTALL README build.sh build.cfg.in $(man_MANS) \ - README.customs README.OS2 \ + src/mkconfig.h README.customs README.OS2 \ README.Amiga SCOPTIONS src/config.ami \ README.DOS builddos.bat src/configh.dos \ README.W32 build_w32.bat src/config.h.W32 \ @@ -144,7 +144,7 @@ dist-hook: # --------------- Local CHECK Section check-local: check-regression - @banner=" Regression PASSED: GNU Make $(VERSION) ($(MAKE_HOST)) built with $(CC) "; \ + @banner=" Regression PASSED: $(PACKAGE_STRING) ($(MAKE_HOST)) built with $(CC) "; \ dashes=`echo "$$banner" | sed s/./=/g`; \ echo; \ echo "$$dashes"; \ @@ -182,7 +182,7 @@ check-regression: tests/config-flags.pm echo "Can't find a working Perl ($(PERL)); the test suite requires Perl."; \ fi; \ else \ - echo "Can't find the GNU Make test suite ($(top_srcdir)/tests)."; \ + echo "Can't find the $(PACKAGE_NAME) test suite ($(top_srcdir)/tests)."; \ fi |