X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/9d30652149fd745711342cec7ee8574e973ec241..7a700b78d71e8b2caab274243eba1caba5cb9725:/openwrt/rules.mk

diff --git a/openwrt/rules.mk b/openwrt/rules.mk
index 681d4f9b1..b8ed526a0 100644
--- a/openwrt/rules.mk
+++ b/openwrt/rules.mk
@@ -1,6 +1,6 @@
 include $(TOPDIR)/.config
 MAKE1=make
-MAKE=make -j$(BR2_JLEVEL)
+MAKEFLAGS=-j$(BR2_JLEVEL)
 
 # Strip off the annoying quoting
 ARCH:=$(strip $(subst ",, $(BR2_ARCH)))
@@ -73,6 +73,7 @@ LINUX_VERSION=2.4.29
 LINUX_DIR:=$(BUILD_DIR)/linux
 LINUX_HEADERS_DIR:=$(TOOL_BUILD_DIR)/linux
 LINUX_KERNEL:=$(BUILD_DIR)/buildroot-kernel
+LINUX_IMAGE:=$(BUILD_DIR)/buildroot-kernel-image
 MODULES_SUBDIR := lib/modules/$(LINUX_VERSION)
 MODULES_DIR := $(BUILD_DIR)/modules/$(MODULES_SUBDIR)
 
@@ -112,11 +113,12 @@ 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_INSTROOT=$(TARGET_DIR) 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
 
 # where to build (and put) .ipk packages
-IPKG_TARGET_DIR := $(BUILD_DIR)
+IPKG_TARGET_DIR := $(PACKAGE_DIR)