From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 23 Dec 2007 23:15:15 +0000 (+0000)
Subject: fix uclibc++ build
X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=929db4a0f7beb5bdbec25448e51522a20deadf61;p=packages.git

fix uclibc++ build


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

diff --git a/libs/uclibc++/Makefile b/libs/uclibc++/Makefile
index 3202e0c60..5c49d6306 100644
--- a/libs/uclibc++/Makefile
+++ b/libs/uclibc++/Makefile
@@ -73,15 +73,15 @@ define Build/InstallDev
 	$(SED) 's|-I/include/|-I$(1)/usr/include/uClibc++/|g' $(2)/bin/g++-uc
 	$(SED) 's|-L/lib/|-L$(1)/usr/lib/|g' $(2)/bin/g++-uc
 # add another wrapper which links against both uClibc++ and libstdc++ 
-	$(INSTALL_BIN) $(1)/usr/bin/g++-uc $(2)/bin/g++-uc+std
+	$(INSTALL_BIN) $(2)/bin/g++-uc $(2)/bin/g++-uc+std
 	$(SED) 's|^WRAPPER_INCLUDEDIR=.*||g' $(2)/bin/g++-uc+std
 	$(SED) 's|-luClibc++|-Wl,-Bdynamic,-luClibc++,-Bstatic,-lstdc++,-Bdynamic|g' $(2)/bin/g++-uc+std
 	$(SED) 's|-nostdinc++||g' $(2)/bin/g++-uc+std
 endef
 	
 define Build/UninstallDev
-	rm -rf $(2)/usr/bin/g++-uc \
-		$(2)/usr/bin/g++-uc+std \
+	rm -rf $(2)/bin/g++-uc \
+		$(2)/bin/g++-uc+std \
 		$(1)/usr/include/uClibc++ \
 		$(1)/usr/lib/libuClibc++*.{a,so*}
 endef