X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=libs%2Fuclibc%2B%2B%2FMakefile;h=3b438fefb1e7a7d8f8a1b66a4b4eedc75bab0595;hp=8a321f4538f1ffffded1cec99c5aa0a6dc5c2100;hb=289168da7d3b3b20ca039539871483bd25a4e325;hpb=25b680300e4045f2715128a41efe215ec8689568

diff --git a/libs/uclibc++/Makefile b/libs/uclibc++/Makefile
index 8a321f4538..3b438fefb1 100644
--- a/libs/uclibc++/Makefile
+++ b/libs/uclibc++/Makefile
@@ -64,26 +64,17 @@ define Build/Compile
 endef
 
 define Build/InstallDev
-	mkdir -p $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/g++-uc $(1)/usr/bin/
-	mkdir -p $(1)/usr/include/uClibc++
+	$(INSTALL_DIR) $(2)/bin $(1)/usr/include/uClibc++ $(1)/usr/lib
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/g++-uc $(2)/bin/
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/uClibc++/
-	mkdir -p $(1)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libuClibc++*.{a,so*} $(1)/usr/lib/
-	$(SED) 's|-I/include/|-I$(1)/usr/include/uClibc++/|g' $(1)/usr/bin/g++-uc
-	$(SED) 's|-L/lib/|-L$(1)/usr/lib/|g' $(1)/usr/bin/g++-uc
+	$(SED) 's|-I/include/|-I$(STAGING_DIR)/usr/include/uClibc++/|g' $(2)/bin/g++-uc
+	$(SED) 's|-L/lib/|-L$(STAGING_DIR)/usr/lib/|g' $(2)/bin/g++-uc
 # add another wrapper which links against both uClibc++ and libstdc++ 
-	$(CP) $(1)/usr/bin/g++-uc $(1)/usr/bin/g++-uc+std
-	$(SED) 's|^WRAPPER_INCLUDEDIR=.*||g' $(1)/usr/bin/g++-uc+std
-	$(SED) 's|-luClibc++|-Wl,-Bdynamic,-luClibc++,-Bstatic,-lstdc++,-Bdynamic|g' $(1)/usr/bin/g++-uc+std
-	$(SED) 's|-nostdinc++||g' $(1)/usr/bin/g++-uc+std
-endef
-	
-define Build/UninstallDev
-	rm -rf	$(STAGING_DIR)/usr/bin/g++-uc \
-		$(STAGING_DIR)/usr/bin/g++-uc+std \
-		$(STAGING_DIR)/usr/include/uClibc++ \
-		$(STAGING_DIR)/usr/lib/libuClibc++*.{a,so*}
+	$(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 Package/uclibcxx/install