summaryrefslogtreecommitdiff
path: root/bootstrap
diff options
context:
space:
mode:
authorAlexandre Duret-Lutz <adl@gnu.org>2003-04-24 18:48:07 +0000
committerAlexandre Duret-Lutz <adl@gnu.org>2003-04-24 18:48:07 +0000
commitab57cf2823f68bb3de9caf44607984de02bdd717 (patch)
treebfdcaa3d5ed0cf31be12e839fce18a43a3dbb72f /bootstrap
parentb51046f01969592bed5f197337efd108f8fc2bea (diff)
downloadautomake-ab57cf2823f68bb3de9caf44607984de02bdd717.tar.gz
* automake.in (scan_aclocal_m4): Do not parse ACLOCAL_AMFLAGS
and glob for m4_files (We've got all local m4 files while tracing m4_include's). Diagnose ACLOCAL_M4_SOURCES as obsolete. Distribute aclocal.m4 only at the top-level. (my_glob): Remove. This fixes PR automake/11. (handle_dist): Strip leading `./' from directories. * aclocal.in (add_file): Output 'm4_include([file.m4])' instead of copying local files. (write_aclocal, parse_arguments): Bump copyright date. * configure.in: De not build m4/amversion.m4 from here ... * m4/Makefile.am ($(srcdir)/amversion.m4): ... do this here. (nodist_m4data_DATA): Use $(srcdir)/amversion.m4 instead of amversion.m4. * tests/Makefile.am (XFAIL_TESTS): Remove aclocal5.test. (TESTS): Remove aclocal2.test. Do not test aclocal.test twice. * tests/aclocal2.test: Delete (pointless). * tests/aclocal5.test: Make sure configure's dependencies are distributed. * tests/acinclude.test: Adjust to search for m4_include. * tests/dirlist.test, tests/dup3.test: Run $AUTOCONF and grep configure instead of aclocal.m4.
Diffstat (limited to 'bootstrap')
-rwxr-xr-xbootstrap11
1 files changed, 4 insertions, 7 deletions
diff --git a/bootstrap b/bootstrap
index c0595697a..ac1cfb35d 100755
--- a/bootstrap
+++ b/bootstrap
@@ -99,16 +99,13 @@ sed -e "s%@PERL@%$PERL%g" \
-e "s%@SHELL@%$BOOTSTRAP_SHELL%g" \
aclocal.in >aclocal.tmp
-# Create temporary replacement for amversion.m4
-sed -e "s%@PERL@%$PERL%g" \
- -e "s%@VERSION@%$VERSION%g" \
+# Overwrite amversion.m4
+sed -e "s%@VERSION@%$VERSION%g" \
-e "s%@APIVERSION@%$APIVERSION%g" \
- -e "s%@PACKAGE@%$PACKAGE%g" \
- -e "s%@datadir@%$datadir%g" \
- m4/amversion.in >aclocal-$APIVERSION/amversion-tmp.m4
+ m4/amversion.in >m4/amversion.m4
# Run aclocal
-$PERL ./aclocal.tmp -I aclocal-$APIVERSION -I m4
+$PERL ./aclocal.tmp -I m4
# Create temporary replacement for automake
sed -e "s%@PERL@%$PERL%g" \