diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2002-10-29 17:14:57 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@penguin.transmeta.com> | 2002-10-29 17:14:57 -0800 |
| commit | 2fc8b9411e8a22d487b6a10985537277dfbf154e (patch) | |
| tree | 1f6de396bc13b05d4df6c3cff632f063090b021f | |
| parent | 0e01a0dd1f8209c0a64cbbbf99eab467e7401df5 (diff) | |
| parent | 9876ddfe1048e1127225cb779be09f25a600f82b (diff) | |
Merge http://linux-isdn.bkbits.net/linux-2.5.make
into home.transmeta.com:/home/torvalds/v2.5/kconfig
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | scripts/Makefile.build | 2 | ||||
| -rw-r--r-- | scripts/Makefile.modver | 4 |
3 files changed, 5 insertions, 3 deletions
@@ -214,7 +214,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 657114e31089..4e4de97a8b4f 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 |