From: Felix Fietkau <nbd@openwrt.org>
Date: Fri, 15 Jul 2005 16:16:07 +0000 (+0000)
Subject: make uclibc++ install into the staging dir again
X-Git-Tag: whiterussian_rc4~326
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=1295c462d5c8e701f672afdf5e8be92164bad040;p=openwrt%2Fsvn-archive%2Fopenwrt.git

make uclibc++ install into the staging dir again

SVN-Revision: 1441
---

diff --git a/openwrt/package/uclibc++/Makefile b/openwrt/package/uclibc++/Makefile
index 32587c34be..9e071c511f 100644
--- a/openwrt/package/uclibc++/Makefile
+++ b/openwrt/package/uclibc++/Makefile
@@ -12,7 +12,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tbz2
 PKG_CAT:=bzcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(TOPDIR)/package/rules.mk
 
@@ -41,8 +40,7 @@ $(PKG_BUILD_DIR)/.configured:
 $(PKG_BUILD_DIR)/.built:
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		$(TARGET_CONFIGURE_OPTS) CROSS="$(TARGET_CROSS)" \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
+		all
 	touch $@
 
 $(IPKG_UCLIBCXX):
@@ -51,3 +49,10 @@ $(IPKG_UCLIBCXX):
 	$(STRIP) $(IDIR_UCLIBCXX)/usr/lib/*.so*
 	mkdir -p $(PACKAGE_DIR)
 	$(IPKG_BUILD) $(IDIR_UCLIBCXX) $(PACKAGE_DIR)
+
+compile: install-dev
+install-dev:
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		$(TARGET_CONFIGURE_OPTS) CROSS="$(TARGET_CROSS)" \
+		DESTDIR="$(STAGING_DIR)" \
+		install