From: Gary V. Vaughan Date: Thu, 20 Oct 2011 16:40:13 +0000 (+0700) Subject: build: avoid spurious bootstrap_edit call. X-Git-Tag: v2.4.2.418~342 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ade0d8f39c200c74a77d0c7f095b158a4591bb18;p=thirdparty%2Flibtool.git build: avoid spurious bootstrap_edit call. * Makefile.am (tests/package.m4): @FOO@ substitutions have already been made by the time Makefile.am has been transformed into Makefile, so don't try to rerun the substitutions manually with $(bootstrap_edit) after the fact. Signed-off-by: Gary V. Vaughan --- diff --git a/ChangeLog b/ChangeLog index c51e74943..fbb1b0070 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2010-10-20 Gary V. Vaughan + + build: avoid spurious bootstrap_edit call. + * Makefile.am (tests/package.m4): @FOO@ substitutions have already + been made by the time Makefile.am has been transformed into Makefile, + so don't try to rerun the substitutions manually with + $(bootstrap_edit) after the fact. + 2011-10-17 Gary V. Vaughan Post-release administrivia. diff --git a/Makefile.am b/Makefile.am index 268b3997d..d8b0a46c3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -561,7 +561,7 @@ $(srcdir)/tests/package.m4: $(srcdir)/configure.ac Makefile.am echo 'm4_define([AT_PACKAGE_STRING], [@PACKAGE_STRING@])'; \ echo 'm4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \ echo 'm4_define([AT_PACKAGE_URL], [@PACKAGE_URL@])'; \ - } | $(bootstrap_edit) > $(srcdir)/tests/package.m4 + } > $(srcdir)/tests/package.m4 tests/atconfig: $(top_builddir)/config.status $(SHELL) ./config.status tests/atconfig