maint: factor out ltmain.sh variable deletion.

* Makefile.am (ltmain_sh_edit): Expand upon bootstrap edit by
adding the extra line to delete boilerplate variable settings
from libltdl/config/general.m4sh that don't apply here.
(libltdl/config/ltmain.sh): Use it.

diff --git a/ChangeLog b/ChangeLog
index bdfb2be2ead82275c1f70e053b13c6a8a33d0013..49efdc897cddaee3406bb15abd2222069ac8bb4a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-09-26  Gary V. Vaughan  <gary@gnu.org>
+
+       maint: factor out ltmain.sh variable deletion.
+       * Makefile.am (ltmain_sh_edit): Expand upon bootstrap edit by
+       adding the extra line to delete boilerplate variable settings
+       from libltdl/config/general.m4sh that don't apply here.
+       (libltdl/config/ltmain.sh): Use it.
+
 2010-09-25  Gary V. Vaughan  <gary@gnu.org>
 
        maint: DRYing out `Makefile.am' file paths.

diff --git a/Makefile.am b/Makefile.am
index 2e6a6d0b13b9e76a80e8c592c0e2dade60aaeb3c..f574fea8a5ca01e5e8594b0d35dfa6967fcf0195 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -116,6 +116,12 @@ bootstrap_edit  = $(SED) \
                  -e "s,@TIMESTAMP\@,$$TIMESTAMP,g" \
                  -e 's,@VERSION\@,$(VERSION),g'
 
+## ltmain.sh needs some additional editing to remove unsubstituted
+## variable defaulting lines, because ltmain.sh never gets passed
+## through $(configure_edit).
+ltmain_sh_edit = $(bootstrap_edit) \
+                 -e '/^: \$${.*="@.*@"}$$/d'
+
 ## We build ltversion.m4 here, instead of from config.status,
 ## because config.status is rerun each time one of configure's
 ## dependencies change and ltversion.m4 happens to be a configure
@@ -162,9 +168,8 @@ $(ltmain_sh): $(ltmain_m4sh) $(sh_files) $(configure_ac) ChangeLog
        done; \
        if $$rebuild; then \
          rm -f '$@'; \
-         echo "$(LT_M4SH) '$(ltmain.m4sh)' | $(bootstrap_edit) > '$@'"; \
-         $(LT_M4SH) '$(ltmain_m4sh)' \
-             | $(bootstrap_edit) -e '/^: \$${.*="@.*@"}$$/d' > '$@'; \
+         echo "$(LT_M4SH) '$(ltmain.m4sh)' | $(ltmain_sh_edit) > '$@'"; \
+         $(LT_M4SH) '$(ltmain_m4sh)' | $(ltmain_sh_edit) > '$@'; \
          chmod a-w '$@'; \
        fi