From: Jo-Philipp Wich <jow@openwrt.org>
Date: Mon, 11 Jun 2012 21:50:50 +0000 (+0000)
Subject: autotools.mk: cope with Debian version strings in libtool
X-Git-Tag: attitude_adjustment_12.09~1120
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=d40fe9d24ec6802cf86a710fbbcad6437a951559;p=openwrt%2Fsvn-archive%2Fopenwrt.git

autotools.mk: cope with Debian version strings in libtool

SVN-Revision: 32207
---

diff --git a/include/autotools.mk b/include/autotools.mk
index c5ba748ab9..8796598569 100644
--- a/include/autotools.mk
+++ b/include/autotools.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2007-2011 OpenWrt.org
+# Copyright (C) 2007-2012 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -51,9 +51,9 @@ endef
 
 # 1: build dir
 define patch_libtool
-	(cd $(1); \
+	@(cd $(1); \
 		for lt in $$$$($$(STAGING_DIR_HOST)/bin/find . -name ltmain.sh); do \
-			lt_version="$$$$($$(STAGING_DIR_HOST)/bin/sed -ne 's,^[[:space:]]*VERSION=\([0-9]\.[0-9]\+\).*,\1,p' $$$$lt)"; \
+			lt_version="$$$$($$(STAGING_DIR_HOST)/bin/sed -ne 's,^[[:space:]]*VERSION="\?\([0-9]\.[0-9]\+\).*,\1,p' $$$$lt)"; \
 			case "$$$$lt_version" in \
 				1.5|2.2|2.4) echo "autotools.mk: Found libtool v$$$$lt_version - applying patch to $$$$lt"; \
 					(cd $$$$(dirname $$$$lt) && $$(PATCH) -N -s -p1 < $$(TOPDIR)/tools/libtool/files/libtool-v$$$$lt_version.patch || true) ;; \