libtool: remove redundant unsubstituted shell var defaults.

* Makefile.am (libltdl/config/ltmain.sh): Boilerplate code from
libltdl/config/general.m4 sets some default shell variables
designed to be substituted by `$(configure_edit)'.  Actually,
`libtool' uses the language tag values for those variables, and
`ltmain.m4sh' is not passed through `$(configure_edit)', so they
are just noise.  Edit them out at bootstrap time.

Signed-off-by: Gary V. Vaughan <gary@gnu.org>

diff --git a/ChangeLog b/ChangeLog
index 473de9feebe95a487ad56ac0c948736c78fa7db6..f939b295fbb2c88ddf3a74563470e24c3939de5d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-24  Gary V. Vaughan  <gary@gnu.org>
+
+       libtool: remove redundant unsubstituted shell var defaults.
+       * Makefile.am (libltdl/config/ltmain.sh): Boilerplate code from
+       libltdl/config/general.m4 sets some default shell variables
+       designed to be substituted by `$(configure_edit)'.  Actually,
+       `libtool' uses the language tag values for those variables, and
+       `ltmain.m4sh' is not passed through `$(configure_edit)', so they
+       are just noise.  Edit them out at bootstrap time.
+
 2010-08-31  Gary V. Vaughan  <gary@gnu.org>
 
        maint: don't leak developer GREP, SED etc into distribution file.

diff --git a/Makefile.am b/Makefile.am
index 12f7c92394fa2b456c3dd9ba8ed79f41301a7cdd..c932118124ec47ce812f31ce93d6a7e9179a2e5c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -157,8 +157,8 @@ $(srcdir)/$(auxdir)/ltmain.sh: $(sh_files) $(auxdir)/ltmain.m4sh configure.ac Ch
            > $(auxdir)/ltmain.in; \
          echo $(bootstrap_edit) \
            $(srcdir)/$(auxdir)/ltmain.in "> $$target"; \
-         $(bootstrap_edit) \
-               $(auxdir)/ltmain.in > $(auxdir)/ltmain.tmp; \
+         $(bootstrap_edit) -e '/^: \$${.*="@.*@"}$$/d' \
+           $(auxdir)/ltmain.in > $(auxdir)/ltmain.tmp; \
          rm -f $(auxdir)/ltmain.in; \
          chmod a-w $(auxdir)/ltmain.tmp; \
          mv -f $(auxdir)/ltmain.tmp $(auxdir)/ltmain.sh; \