fix x86-2.6 build

[openwrt.git] / openwrt / target / linux / kernel.mk

diff --git a/openwrt/target/linux/kernel.mk b/openwrt/target/linux/kernel.mk
index 22c6d84..5406fae 100644 (file)
--- a/openwrt/target/linux/kernel.mk
+++ b/openwrt/target/linux/kernel.mk
@@ -55,15 +55,10 @@ $(LINUX_DIR)/.modules_done:
        $(MAKE) -C "$(LINUX_DIR)" CROSS_COMPILE="$(KERNEL_CROSS)" DEPMOD=true INSTALL_MOD_PATH=$(LINUX_BUILD_DIR)/modules modules_install $(MAKE_TRACE)
        touch $(LINUX_DIR)/.modules_done
 
-# $(STAGING_DIR)/include/linux/version.h: $(LINUX_DIR)/.configured
-#      mkdir -p $(STAGING_DIR)/include
-#      tar -ch -C $(LINUX_DIR)/include -f - linux | tar -xf - -C $(STAGING_DIR)/include/
-#      tar -ch -C $(LINUX_DIR)/include -f - asm | tar -xf - -C $(STAGING_DIR)/include/
-
 $(STAMP_DIR)/.linux-compile:
        @$(MAKE) $(LINUX_DIR)/.modules_done $(TARGETS) $(KERNEL_IPKG) $(MAKE_TRACE)
        ln -sf $(LINUX_BUILD_DIR)/linux-$(LINUX_VERSION) $(BUILD_DIR)/linux $(MAKE_TRACE)
-       @$(TRACE) target/linux/package/compile
+       @$(TRACE) target/linux/package-compile
        $(MAKE) -C $(TOPDIR)/target/linux/package \
                $(KPKG_MAKEOPTS) \
                compile
@@ -97,9 +92,9 @@ prepare:
 compile: prepare $(STAMP_DIR)/.linux-compile
 
 install: compile
-       @$(TRACE) target/linux/package/install
-       $(MAKE) pkg-install $(MAKE_TRACE)
-       $(MAKE) $(LINUX_KERNEL) $(MAKE_TRACE)
+       @$(TRACE) target/linux/package-install
+       $(MAKE) $(KPKG_MAKEOPTS) pkg-install $(MAKE_TRACE)
+       $(MAKE) $(KPKG_MAKEOPTS) $(LINUX_KERNEL) $(MAKE_TRACE)
 
 mostlyclean:
        rm -f $(STAMP_DIR)/.linux-compile
@@ -119,3 +114,8 @@ clean:
        rm -f $(STAMP_DIR)/.linux-compile
        rm -rf $(LINUX_BUILD_DIR)
        rm -f $(TARGETS)
+
+package/%:
+       $(MAKE) -C $(TOPDIR)/target/linux/package \
+               $(KPKG_MAKEOPTS) \
+               $(patsubst package/%,%,$@)