summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorKai Germaschewski <kai@tp1.ruhr-uni-bochum.de>2002-10-29 21:23:01 -0600
committerKai Germaschewski <kai@tp1.ruhr-uni-bochum.de>2002-10-29 21:23:01 -0600
commit9876ddfe1048e1127225cb779be09f25a600f82b (patch)
treeab511b8f133dafe67178b41bef4504a098795f94 /scripts
parentafed13861e6bd0e308d3d53b38ed11e4eabe3a2f (diff)
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.
Diffstat (limited to 'scripts')
-rw-r--r--scripts/Makefile.build2
-rw-r--r--scripts/Makefile.modver4
2 files changed, 4 insertions, 2 deletions
diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index cd75f49b58f9..c6f1a29f560d 100644
--- 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 0ee922a3aadf..92f54fa99211 100644
--- 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