From a2bb0c980f2b50ab31fedd18bb4890843b3d399a Mon Sep 17 00:00:00 2001 From: "Gary V. Vaughan" Date: Fri, 24 Sep 2010 12:51:36 +0700 Subject: [PATCH] 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 --- ChangeLog | 10 ++++++++++ Makefile.am | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 473de9fee..f939b295f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2010-09-24 Gary V. Vaughan + + 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 maint: don't leak developer GREP, SED etc into distribution file. diff --git a/Makefile.am b/Makefile.am index 12f7c9239..c93211812 100644 --- 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; \ -- 2.47.2