Commit 9876ddfe authored by Kai Germaschewski's avatar Kai Germaschewski

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.
parent afed1386
...@@ -211,7 +211,7 @@ SUBDIRS := ...@@ -211,7 +211,7 @@ SUBDIRS :=
ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),) ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
include-config := 1 export include-config := 1
-include .config -include .config
......
...@@ -7,7 +7,9 @@ src := $(obj) ...@@ -7,7 +7,9 @@ src := $(obj)
.PHONY: __build .PHONY: __build
__build: __build:
ifdef include-config
include .config include .config
endif
include $(obj)/Makefile include $(obj)/Makefile
......
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
src := $(obj) src := $(obj)
MODVERDIR := include/linux/modules
.PHONY: modver .PHONY: modver
modver: modver:
...@@ -28,8 +30,6 @@ else ...@@ -28,8 +30,6 @@ else
# This sets version suffixes on exported symbols # This sets version suffixes on exported symbols
# --------------------------------------------------------------------------- # ---------------------------------------------------------------------------
MODVERDIR := include/linux/modules
# #
# Added the SMP separator to stop module accidents between uniprocessor # Added the SMP separator to stop module accidents between uniprocessor
# and SMP Intel boxes - AC - from bits by Michael Chastain # and SMP Intel boxes - AC - from bits by Michael Chastain
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment