X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=rules.mk;h=b8ed526a0c8a8ccefd46f952483a50fee3d2e5be;hb=d06f0ec5f269e295f05c83648b908b698ba74587;hp=ba027d4576ac3d2cb576e9aaff3328b04e41e9c2;hpb=a23ed95f5d50b550a911737b5eccf1576aafe10e;p=openwrt-10.03%2F.git diff --git a/rules.mk b/rules.mk index ba027d457..b8ed526a0 100644 --- a/rules.mk +++ b/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,7 +113,7 @@ endif # invoke ipkg with configuration in $(STAGING_DIR)/etc/ipkg.conf -IPKG := IPKG_CONF_DIR=$(STAGING_DIR)/etc $(TARGET_DIR)/bin/ipkg -force-defaults -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