X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/c45b60efa60390a92e25f7138c2acd9f1029659a..c5a8e485748b0fd8db2b4e3251989e23603bf2c1:/include/toplevel.mk

diff --git a/include/toplevel.mk b/include/toplevel.mk
index e9384aebc..4c9b85c21 100644
--- a/include/toplevel.mk
+++ b/include/toplevel.mk
@@ -31,6 +31,8 @@ unexport P4PORT P4USER P4CONFIG P4CLIENT
 # prevent user defaults for quilt from interfering
 unexport QUILT_PATCHES QUILT_PATCH_OPTS
 
+unexport C_INCLUDE_PATH
+
 # make sure that a predefined CFLAGS variable does not disturb packages
 export CFLAGS=
 
@@ -91,9 +93,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
@@ -134,6 +136,13 @@ prereq:: prepare-tmpinfo .config
 
 %::
 	@+$(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; \
+		if ./scripts/kconfig.pl '>' .config tmp/.config | grep -q CONFIG; then \
+			echo "WARNING: your configuration is out of sync. Please run make menuconfig, oldconfig or defconfig!"; \
+		fi \
+	)
 	@+$(SUBMAKE) -r $@
 
 help: