From: Nicolas Thill <nico@openwrt.org>
Date: Thu, 29 Jan 2009 20:13:01 +0000 (+0000)
Subject: move IPKG_STATE_DIR from ./rules.mk to ./include/package-ipkg.mk and change its value... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=1be509269201bb4ed48f89a918a36594e0442df2;p=openwrt%2Fstaging%2Frobimarko.git

move IPKG_STATE_DIR from ./rules.mk to ./include/package-ipkg.mk and change its value to suit opkg

SVN-Revision: 14269
---

diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk
index b91a27710b..8b4c042a07 100644
--- a/include/package-ipkg.mk
+++ b/include/package-ipkg.mk
@@ -17,6 +17,8 @@ IPKG:= \
 IPKG_BUILD:= \
   ipkg-build -c -o 0 -g 0
 
+IPKG_STATE_DIR:=$(TARGET_DIR)/usr/lib/opkg
+
 define BuildIPKGVariable
   $(call shexport,Package/$(1)/$(2))
   $(1)_COMMANDS += var2file "$(call shvar,Package/$(1)/$(2))" $(2);
diff --git a/rules.mk b/rules.mk
index 9c986f889f..8e31a27b6c 100644
--- a/rules.mk
+++ b/rules.mk
@@ -65,7 +65,6 @@ STAMP_DIR:=$(BUILD_DIR)/stamp
 STAMP_DIR_HOST=$(BUILD_DIR_HOST)/stamp
 TARGET_DIR:=$(BUILD_DIR)/root-$(BOARD)
 DEBUG_DIR:=$(BUILD_DIR)/debug-$(BOARD)
-IPKG_STATE_DIR:=$(TARGET_DIR)/usr/lib/ipkg
 
 TARGET_PATH:=$(TOOLCHAIN_DIR)/usr/bin:$(STAGING_DIR_HOST)/bin:$(STAGING_DIR)/host/bin:$(PATH)
 TARGET_CFLAGS:=$(TARGET_OPTIMIZATION)$(if $(CONFIG_DEBUG), -g3)