From: Gary V. Vaughan <gary@gnu.org>
Date: Sun, 26 Sep 2010 09:21:10 +0000 (+0700)
Subject: maint: factor out ltmain.sh variable deletion.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=963cb4d5e39de271e4faadee2450446c087329a4;p=thirdparty%2Flibtool.git

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 bdfb2be2e..49efdc897 100644
--- 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 2e6a6d0b1..f574fea8a 100644
--- 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