From 7afbf5504b09e5a6fca637d8cfcc979bb7d75d2e Mon Sep 17 00:00:00 2001 From: "Gary V. Vaughan" Date: Sun, 26 Sep 2010 16:21:10 +0700 Subject: [PATCH] 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. --- ChangeLog | 8 ++++++++ Makefile.am | 11 ++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 948165095..39326049b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2010-09-26 Gary V. Vaughan + + 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 maint: DRYing out `Makefile.am' file paths. diff --git a/Makefile.am b/Makefile.am index e2e77800c..059f50e7d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -117,6 +117,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 @@ -163,9 +169,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 -- 2.47.2