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 <gary@gnu.org>

diff --git a/ChangeLog b/ChangeLog
index c51e74943eb92a22cd05c13bb5a5b4fdc2eecf89..fbb1b00701789969635fd6e06333f647042322cf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-10-20  Gary V. Vaughan  <gary@gnu.org>
+
+       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  <gary@gnu.org>
 
        Post-release administrivia.

diff --git a/Makefile.am b/Makefile.am
index 268b3997dd26558772577ee21479449562bb3021..d8b0a46c38c35e426966a46da1bfc942739b70a6 100644 (file)
--- 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