From: nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 6 Mar 2005 11:02:08 +0000 (+0000)
Subject: Change ipkg invocation and add -force-defaults option
X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=commitdiff_plain;h=8592838f36cf9fc95ec61f6f38fbc44213894a9e

Change ipkg invocation and add -force-defaults option


git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@313 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/rules.mk b/rules.mk
index 681d4f9b1..4218bbf1b 100644
--- a/rules.mk
+++ b/rules.mk
@@ -112,7 +112,8 @@ endif
 
 
 # invoke ipkg with configuration in $(STAGING_DIR)/etc/ipkg.conf 
-IPKG := PATH="$(TARGET_PATH)" IPKG_CONF_DIR=$(STAGING_DIR)/etc ipkg -force-depends
+IPKG := IPKG_CONF_DIR=$(STAGING_DIR)/etc $(TARGET_DIR)/bin/ipkg -force-defaults -force-depends
+IPKG_STATE_DIR := $(TARGET_DIR)/usr/lib/ipkg
 
 # invoke ipkg-build with some default options
 IPKG_BUILD := PATH="$(TARGET_PATH)" ipkg-build -c -o root -g root