From: Gary V. Vaughan <gary@gnu.org>
Date: Fri, 25 Nov 2011 07:50:37 +0000 (+0700)
Subject: build: fix a quoting bug when regenerating with bootstrap_edit.
X-Git-Tag: v2.4.2.418~231
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0893c48bdaa0d1cc1bc9e434f43df14b5994ede3;p=thirdparty%2Flibtool.git

build: fix a quoting bug when regenerating with bootstrap_edit.

* Makefile.am (m4/ltversion.m4, build-aux/ltmain.sh): The
bootstrap_edit make macro already contains double quotes, so
when echoing it, don't surround it with more double quotes since
it is not escaped.

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

diff --git a/Makefile.am b/Makefile.am
index 2c6cf811a..5420510e7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -152,7 +152,7 @@ $(ltversion_m4): $(ltversion_in) $(dotversion)
 	    serial=`$(git_commit_count)`; \
 	  fi; \
 	  if test 0 = '$(V)'; then echo "  GEN   " $@; \
-	  else echo "$(bootstrap_edit) '$(ltversion_in)' > '$@'"; fi; \
+	  else echo $(bootstrap_edit) "'$(ltversion_in)' > '$@'"; fi; \
 	  $(bootstrap_edit) '$(ltversion_in)' > '$@'; \
 	  chmod a-w '$@'; \
 	fi
@@ -179,7 +179,7 @@ $(ltmain_sh): $(ltmain_m4sh) $(sh_files) $(dotversion)
 	if $$rebuild; then \
 	  rm -f '$@'; \
 	  if test 0 = '$(V)'; then echo "  GEN   " $@; \
-	  else echo "$(LT_M4SH) '$(ltmain.m4sh)' | $(ltmain_sh_edit) > '$@'"; fi; \
+	  else echo "$(LT_M4SH) '$(ltmain.m4sh)' |" $(ltmain_sh_edit) "> '$@'"; fi; \
 	  $(LT_M4SH) '$(ltmain_m4sh)' | $(ltmain_sh_edit) > '$@'; \
 	  chmod a-w '$@'; \
 	fi