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

SVN-Revision: 14269

diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk
index b91a27710bd55f505474df75482a3537af221697..8b4c042a076775f0df48d1426a4afe9e167d62f8 100644 (file)
--- 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 9c986f889fa7edae96856f49fdccd69024a3ff83..8e31a27b6cf1b96c5c5f3425f2bf540ab1a450ff 100644 (file)
--- 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)