From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 23 Dec 2007 01:27:51 +0000 (+0000)
Subject: fix libtool staging
X-Git-Url: http://git.archive.openwrt.org/?a=commitdiff_plain;h=6448b9e0a1969551683095eccb1a0cec583479a5;p=packages.git

fix libtool staging


git-svn-id: svn://svn.openwrt.org/openwrt/packages@9867 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/libs/libtool/Makefile b/libs/libtool/Makefile
index 29f25261f..fae657ce0 100644
--- a/libs/libtool/Makefile
+++ b/libs/libtool/Makefile
@@ -50,9 +50,9 @@ define Build/Compile
 endef
 
 define Build/InstallDev
-	mkdir -p $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libtool $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libtoolize $(1)/usr/bin/
+	mkdir -p $(2)/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libtool $(2)/bin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libtoolize $(2)/bin/
 	mkdir -p $(1)/usr/share/
 	$(CP) -R $(PKG_INSTALL_DIR)/usr/share/* $(1)/usr/share/
 	mkdir -p $(1)/usr/include
@@ -62,19 +62,19 @@ define Build/InstallDev
 	mkdir -p $(1)/usr/share/libtool
 	$(CP) $(PKG_INSTALL_DIR)/usr/share/libtool/config.guess $(1)/usr/share/libtool/
 	$(SED) 's|^sys_lib_dlsearch_path_spec=.*|sys_lib_dlsearch_path_spec="$(1)/usr/lib $(1)/lib"|g' \
-		$(1)/usr/bin/libtool
+		$(2)/bin/libtool
 	$(SED) 's|^prefix=.*|prefix=$(1)/usr|g' \
-		$(1)/usr/bin/libtoolize
+		$(2)/bin/libtoolize
 	$(SED) 's|^datadir=.*|datadir=$(1)/usr/share|g' \
-		$(1)/usr/bin/libtoolize
+		$(2)/bin/libtoolize
 endef
 
 define Build/UninstallDev
 	rm -rf \
-		$(STAGING_DIR)/usr/bin/libtool \
-		$(STAGING_DIR)/usr/include/ltdl.h \
-		$(STAGING_DIR)/usr/lib/libltdl.{a,so*} \
-		$(STAGING_DIR)/usr/share/libtool
+		$(2)/bin/libtool* \
+		$(1)/usr/include/ltdl.h \
+		$(1)/usr/lib/libltdl.{a,so*} \
+		$(1)/usr/share/libtool
 endef
 
 define Package/libltdl/install