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

SVN-Revision: 14269
16 years ago · 1be5092692
parent b839bd2111
commit 1be5092692
2 changed files with 2 additions and 1 deletions
--- 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);
--- 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)