aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Thill <nico@openwrt.org>2009-01-29 20:13:01 +0000
committerNicolas Thill <nico@openwrt.org>2009-01-29 20:13:01 +0000
commit044375f28ef2b77b6409a95d3604ea0393942c34 (patch)
tree51a753ba0e206fd32203ce7e92249294549194b9
parentab3a36b4a6ead6bf6cd93083730d1e879d553718 (diff)
downloadupstream-044375f28ef2b77b6409a95d3604ea0393942c34.tar.gz
upstream-044375f28ef2b77b6409a95d3604ea0393942c34.tar.bz2
upstream-044375f28ef2b77b6409a95d3604ea0393942c34.zip
move IPKG_STATE_DIR from ./rules.mk to ./include/package-ipkg.mk and change its value to suit opkg
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14269 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--include/package-ipkg.mk2
-rw-r--r--rules.mk1
2 files changed, 2 insertions, 1 deletions
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)