kernel: update linux 3.2 to 3.2.15

[openwrt/svn-archive/archive.git] / include / toplevel.mk

diff --git a/include/toplevel.mk b/include/toplevel.mk
index b215e41afdb90a0d8d54eb60f621942b081259fc..9a60139329cdc18a5dca6c8682b8609fff956a54 100644 (file)
--- a/include/toplevel.mk
+++ b/include/toplevel.mk
@@ -31,6 +31,11 @@ unexport P4PORT P4USER P4CONFIG P4CLIENT
 # prevent user defaults for quilt from interfering
 unexport QUILT_PATCHES QUILT_PATCH_OPTS
 
+unexport C_INCLUDE_PATH
+
+# prevent distro default LPATH from interfering
+unexport LPATH
+
 # make sure that a predefined CFLAGS variable does not disturb packages
 export CFLAGS=
 
@@ -91,9 +96,9 @@ menuconfig: scripts/config/mconf prepare-tmpinfo FORCE
 
 prepare_kernel_conf: .config FORCE
 
-ifeq ($(wildcard staging_dir/host/bin/sed),)
+ifeq ($(wildcard staging_dir/host/bin/quilt),)
   prepare_kernel_conf:
-       @+$(SUBMAKE) -r tools/sed/install
+       @+$(SUBMAKE) -r tools/quilt/install
 else
   prepare_kernel_conf: ;
 endif
@@ -133,6 +138,7 @@ prereq:: prepare-tmpinfo .config
        @+$(NO_TRACE_MAKE) -r -s $@
 
 %::
+       @+$(PREP_MK) $(NO_TRACE_MAKE) -r -s prereq
        @( \
                cp .config tmp/.config; \
                ./scripts/config/conf -D tmp/.config -w tmp/.config Config.in > /dev/null 2>&1; \
@@ -140,7 +146,6 @@ prereq:: prepare-tmpinfo .config
                        echo "WARNING: your configuration is out of sync. Please run make menuconfig, oldconfig or defconfig!"; \
                fi \
        )
-       @+$(PREP_MK) $(NO_TRACE_MAKE) -r -s prereq
        @+$(SUBMAKE) -r $@
 
 help: