From 0daa9d37c4648ee6062ce366b660ba667fd19bbc Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Sat, 20 Apr 2013 22:18:16 +0200 Subject: [PATCH] Reflect the 'configure.in' -> 'configure.ac' rename throughout In README, code comments, and auxiliary files. Copyright-paperwork-exempt: yes Signed-off-by: Stefano Lattarini --- ChangeLog | 8 ++++++++ Makefile.DOS.template | 2 +- README.git | 4 ++-- build_w32.bat | 2 +- config.h-vms.template | 2 +- 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index ce688c7c..fa8ec89d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2013-04-20 Stefano Lattarini (tiny change) + + * README.git: Our autoconf input file is 'configure.ac', not + 'configure.in'. Adjust accordingly. + * build_w32.bat: Likewise. + * config.h-vms.template: Likewise. + * Makefile.DOS.template: Likewise. + 2013-04-16 Paul Smith * build_w32.bat: Add load.c to the Windows build. diff --git a/Makefile.DOS.template b/Makefile.DOS.template index 59c34a8f..3ec01be3 100644 --- a/Makefile.DOS.template +++ b/Makefile.DOS.template @@ -122,7 +122,7 @@ man1dir = $(mandir)/man1 MANS = $(man_MANS) NROFF = nroff -DIST_COMMON = README ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL Makefile.am Makefile.in NEWS acconfig.h aclocal.m4 alloca.c build.sh-in config.h-in configure configure.in getloadavg.c +DIST_COMMON = README ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL Makefile.am Makefile.in NEWS acconfig.h aclocal.m4 alloca.c build.sh-in config.h-in configure configure.ac getloadavg.c DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) diff --git a/README.git b/README.git index 82c33e59..59ab0903 100644 --- a/README.git +++ b/README.git @@ -61,7 +61,7 @@ Building From Git To build GNU make from Git, you will need Autoconf, Automake, and Gettext, and any tools that those utilities require (GNU m4, Perl, -etc.). See the configure.in file to find the minimum versions of each +etc.). See the configure.ac file to find the minimum versions of each of these tools. You will also need a copy of wget. When building from Git you must build in the source directory: "VPATH @@ -149,7 +149,7 @@ Steps to Release Here are the things that need to be done (in more or less this order) before making an official release: - * Update the configure.in file with the new release number. + * Update the configure.ac file with the new release number. * Update the NEWS file with the release number and date. * In Savannah modify the "Value", "Rank", and "Description" values for the current "SCM" entry in both "Component Version" and "Fix Release" fields diff --git a/build_w32.bat b/build_w32.bat index e02da8ac..63736ebc 100644 --- a/build_w32.bat +++ b/build_w32.bat @@ -18,7 +18,7 @@ rem with this program. If not, see . setlocal if exist config.h.W32 GoTo NotSCM -sed -n "s/^AC_INIT(\[GNU make\],\[\([^]]\+\)\].*/s,%%VERSION%%,\1,g/p" configure.in > config.h.W32.sed +sed -n "s/^AC_INIT(\[GNU make\],\[\([^]]\+\)\].*/s,%%VERSION%%,\1,g/p" configure.ac > config.h.W32.sed echo s,%%PACKAGE%%,make,g >> config.h.W32.sed sed -f config.h.W32.sed config.h.W32.template > config.h.W32 :NotSCM diff --git a/config.h-vms.template b/config.h-vms.template index e5e623cf..de7665e8 100644 --- a/config.h-vms.template +++ b/config.h-vms.template @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ /* config.h. Generated automatically by configure. */ -/* config.h.in. Generated automatically from configure.in by autoheader. */ +/* config.h.in. Generated automatically from configure.ac by autoheader. */ /* Define to 1 if on AIX 3. System headers sometimes define this.