kbuild: Fix menuconfig/xconfig and a modversions problem

If we are to build menuconfig/xconfig, we may not have a .config
yet, so we shouldn't try to include it.

Set MODVERDIR before including the subdir Makefile, drivers/scsi/53c700
needs it.

diff --git a/Makefile b/Makefile
index cd22bf54397d91049b16afddb4ee87d1f2bbe7f4..51a81d33a7e404494890807d8c4a200e4cbe1e76 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -211,7 +211,7 @@ SUBDIRS             :=
 
 ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
 
-include-config := 1
+export include-config := 1
 
 -include .config
 

diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index cd75f49b58f9b8608f8634582819059466631f8a..c6f1a29f560d741c46d77fb43ac9a6c91a4b45ea 100644 (file)
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -7,7 +7,9 @@ src := $(obj)
 .PHONY: __build
 __build:
 
+ifdef include-config
 include .config
+endif
 
 include $(obj)/Makefile
 

diff --git a/scripts/Makefile.modver b/scripts/Makefile.modver
index 0ee922a3aadf2faca2f149f8e1dfe5686d8e47db..92f54fa9921124f84bce6d35d2aefde8da7df1b1 100644 (file)
--- a/scripts/Makefile.modver
+++ b/scripts/Makefile.modver
@@ -4,6 +4,8 @@
 
 src := $(obj)
 
+MODVERDIR := include/linux/modules
+
 .PHONY: modver
 modver:
 
@@ -28,8 +30,6 @@ else
 # This sets version suffixes on exported symbols
 # ---------------------------------------------------------------------------
 
-MODVERDIR := include/linux/modules
-
 #
 # Added the SMP separator to stop module accidents between uniprocessor
 # and SMP Intel boxes - AC - from bits by Michael Chastain