lots of package cleanups/fixes

[openwrt/svn-archive/archive.git] / libs / uclibc++ / Makefile

diff --git a/libs/uclibc++/Makefile b/libs/uclibc++/Makefile
index 3202e0c602e54f498d30e9764ba690a63ade22b3..3b438fefb1e7a7d8f8a1b66a4b4eedc75bab0595 100644 (file)
--- a/libs/uclibc++/Makefile
+++ b/libs/uclibc++/Makefile
@@ -64,27 +64,18 @@ define Build/Compile
 endef
 
 define Build/InstallDev
-       mkdir -p $(2)/bin
+       $(INSTALL_DIR) $(2)/bin $(1)/usr/include/uClibc++ $(1)/usr/lib
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/g++-uc $(2)/bin/
-       mkdir -p $(1)/usr/include/uClibc++
        $(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' $(2)/bin/g++-uc
-       $(SED) 's|-L/lib/|-L$(1)/usr/lib/|g' $(2)/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++ 
-       $(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 \
-               $(1)/usr/include/uClibc++ \
-               $(1)/usr/lib/libuClibc++*.{a,so*}
-endef
 
 define Package/uclibcxx/install
        $(INSTALL_DIR) $(1)/usr/lib