From 0c0d41494f74e35a46e0e94f71d8a7c3bea394bc Mon Sep 17 00:00:00 2001 From: Ben Elliston Date: Sun, 17 Oct 1999 06:29:24 +0000 Subject: [PATCH] 1999-10-07 Alexandre Oliva * Makefile.in (dist): Fixed for srcdir != objdir. 1999-09-21 Akim Demaille * Makefile.in (${srcdir}/configure): Use autoconf.sh to build Autoconf's configure. Before the building was performed running m4 at hand, but much was not done (e.g., __oline__, @BKL@... expansion) 1999-09-17 Akim Demaille * Makefile.in (DISTFILES): Add THANKS. --- Makefile.in | 27 ++++++++++++++++++--------- doc/Makefile.in | 27 ++++++++++++++++++--------- 2 files changed, 36 insertions(+), 18 deletions(-) diff --git a/Makefile.in b/Makefile.in index ab875e6a..edec20b3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,5 +1,5 @@ # Makefile for Autoconf. -# Copyright (C) 1992, 1993, 1994, 1998 Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1998, 1999 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -33,7 +33,7 @@ AWK = @AWK@ PERL = @PERL@ # Programs that are ALWAYS installed (and are created in the build dir). -ASCRIPTS = autoconf autoheader autoreconf autoupdate ifnames +ASCRIPTS = autoconf autoheader autoreconf autoupdate ifnames # M4 input that is frozen. M4FROZEN = autoconf.m4f autoheader.m4f @@ -67,7 +67,7 @@ M4FILES = autoconf.m4 acgeneral.m4 acoldnames.m4 acspecific.m4 autoheader.m4 # Files that can be generated, but should be up to date for a distribution. DISTDEP = info Makefile # Files to distribute. -DISTFILES = AUTHORS COPYING ChangeLog ChangeLog.1 INSTALL \ +DISTFILES = AUTHORS THANKS COPYING ChangeLog ChangeLog.1 INSTALL \ Makefile.in NEWS README TODO $(M4FILES) \ acconfig.h acfunctions acheaders acidentifiers \ acmakevars acprograms autoconf.info* \ @@ -194,8 +194,9 @@ uninstall: ${srcdir}/configure: configure.in $(M4FILES) cd $(srcdir) && \ rm -f configure configure.tmp && \ - $(M4) autoconf.m4 configure.in > configure.tmp && \ - chmod +x configure.tmp && mv configure.tmp configure + M4=$(M4) AC_MACRODIR=. AWK=$(AWK) \ + $(SHELL) ./autoconf.sh + Makefile: Makefile.in config.status $(SHELL) ./config.status config.status: configure @@ -213,7 +214,7 @@ clean mostlyclean distclean maintainer-clean:: done clean mostlyclean distclean maintainer-clean:: - rm -f $(SCRIPTS) *.tmp + rm -f $(SCRIPTS) *.tmp rm -f $(M4FROZEN) rm -f *.aux *.cp *.cps *.dvi *.fn *.fns *.ky *.kys *.log rm -f *.pg *.pgs *.toc *.tp *.tps *.vr *.vrs @@ -228,14 +229,22 @@ TAGS: # Don't depend on DISTFILES because there's no rule for "standards.info*". dist: $(DISTDEP) distname=`sed -e '/define(AC_ACVERSION,/!d' \ - -e 's/[^0-9.]*\([0-9.]*\).*/autoconf-\1/' -e q acgeneral.m4`; \ + -e 's/[^0-9.]*\([0-9.]*\).*/autoconf-\1/' \ + -e q ${srcdir}/acgeneral.m4`; \ rm -fr $$distname; \ mkdir $$distname $$distname/testsuite $$distname/testsuite/config \ $$distname/testsuite/lib $$distname/testsuite/autoconf.g \ $$distname/testsuite/autoconf.s; \ for file in $(DISTFILES); do \ - ln $$file $$distname/$$file \ - || { echo copying $$file instead; cp -p $$file $$distname/$$file;}; \ + if test -f $$file; then \ + ln $$file $$distname/$$file \ + || { echo copying $$file instead; \ + cp -p $$file $$distname/$$file; } ; \ + else for file in `CDPATH=:; cd $(srcdir) && echo $$file`; do \ + ln $(srcdir)/$$file $$distname/$$file \ + || { echo copying $$file instead; \ + cp -p $(srcdir)/$$file $$distname/$$file; } ; \ + done; fi; \ done; \ chmod -R a+rX $$distname; \ tar -chz -f $$distname.tar.gz $$distname; \ diff --git a/doc/Makefile.in b/doc/Makefile.in index ab875e6a..edec20b3 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -1,5 +1,5 @@ # Makefile for Autoconf. -# Copyright (C) 1992, 1993, 1994, 1998 Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1994, 1998, 1999 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -33,7 +33,7 @@ AWK = @AWK@ PERL = @PERL@ # Programs that are ALWAYS installed (and are created in the build dir). -ASCRIPTS = autoconf autoheader autoreconf autoupdate ifnames +ASCRIPTS = autoconf autoheader autoreconf autoupdate ifnames # M4 input that is frozen. M4FROZEN = autoconf.m4f autoheader.m4f @@ -67,7 +67,7 @@ M4FILES = autoconf.m4 acgeneral.m4 acoldnames.m4 acspecific.m4 autoheader.m4 # Files that can be generated, but should be up to date for a distribution. DISTDEP = info Makefile # Files to distribute. -DISTFILES = AUTHORS COPYING ChangeLog ChangeLog.1 INSTALL \ +DISTFILES = AUTHORS THANKS COPYING ChangeLog ChangeLog.1 INSTALL \ Makefile.in NEWS README TODO $(M4FILES) \ acconfig.h acfunctions acheaders acidentifiers \ acmakevars acprograms autoconf.info* \ @@ -194,8 +194,9 @@ uninstall: ${srcdir}/configure: configure.in $(M4FILES) cd $(srcdir) && \ rm -f configure configure.tmp && \ - $(M4) autoconf.m4 configure.in > configure.tmp && \ - chmod +x configure.tmp && mv configure.tmp configure + M4=$(M4) AC_MACRODIR=. AWK=$(AWK) \ + $(SHELL) ./autoconf.sh + Makefile: Makefile.in config.status $(SHELL) ./config.status config.status: configure @@ -213,7 +214,7 @@ clean mostlyclean distclean maintainer-clean:: done clean mostlyclean distclean maintainer-clean:: - rm -f $(SCRIPTS) *.tmp + rm -f $(SCRIPTS) *.tmp rm -f $(M4FROZEN) rm -f *.aux *.cp *.cps *.dvi *.fn *.fns *.ky *.kys *.log rm -f *.pg *.pgs *.toc *.tp *.tps *.vr *.vrs @@ -228,14 +229,22 @@ TAGS: # Don't depend on DISTFILES because there's no rule for "standards.info*". dist: $(DISTDEP) distname=`sed -e '/define(AC_ACVERSION,/!d' \ - -e 's/[^0-9.]*\([0-9.]*\).*/autoconf-\1/' -e q acgeneral.m4`; \ + -e 's/[^0-9.]*\([0-9.]*\).*/autoconf-\1/' \ + -e q ${srcdir}/acgeneral.m4`; \ rm -fr $$distname; \ mkdir $$distname $$distname/testsuite $$distname/testsuite/config \ $$distname/testsuite/lib $$distname/testsuite/autoconf.g \ $$distname/testsuite/autoconf.s; \ for file in $(DISTFILES); do \ - ln $$file $$distname/$$file \ - || { echo copying $$file instead; cp -p $$file $$distname/$$file;}; \ + if test -f $$file; then \ + ln $$file $$distname/$$file \ + || { echo copying $$file instead; \ + cp -p $$file $$distname/$$file; } ; \ + else for file in `CDPATH=:; cd $(srcdir) && echo $$file`; do \ + ln $(srcdir)/$$file $$distname/$$file \ + || { echo copying $$file instead; \ + cp -p $(srcdir)/$$file $$distname/$$file; } ; \ + done; fi; \ done; \ chmod -R a+rX $$distname; \ tar -chz -f $$distname.tar.gz $$distname; \