diff options
author | Roman Zippel <zippel@linux-m68k.org> | 2006-06-09 01:12:51 -0400 |
---|---|---|
committer | Sam Ravnborg <sam@mars.ravnborg.org> | 2006-06-09 10:28:07 -0400 |
commit | 14cdd3c402bf7c66f0bcd76e290f0770a54a4b21 (patch) | |
tree | 1a58bdd177f1d5723a1a695e6165c5904c641c55 /Makefile | |
parent | 250725aa13f5c9595e5bc265ebed8471e816d8b4 (diff) |
kconfig: KCONFIG_OVERWRITECONFIG
If you set KCONFIG_OVERWRITECONFIG in environment, Kconfig will not break
symlinks when .config is a symlink to somewhere else.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -178,6 +178,8 @@ CROSS_COMPILE ?= | |||
178 | # Architecture as present in compile.h | 178 | # Architecture as present in compile.h |
179 | UTS_MACHINE := $(ARCH) | 179 | UTS_MACHINE := $(ARCH) |
180 | 180 | ||
181 | KCONFIG_CONFIG ?= .config | ||
182 | |||
181 | # SHELL used by kbuild | 183 | # SHELL used by kbuild |
182 | CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \ | 184 | CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \ |
183 | else if [ -x /bin/bash ]; then echo /bin/bash; \ | 185 | else if [ -x /bin/bash ]; then echo /bin/bash; \ |
@@ -437,13 +439,13 @@ ifeq ($(dot-config),1) | |||
437 | -include include/config/auto.conf | 439 | -include include/config/auto.conf |
438 | 440 | ||
439 | # To avoid any implicit rule to kick in, define an empty command | 441 | # To avoid any implicit rule to kick in, define an empty command |
440 | .config include/config/auto.conf.cmd: ; | 442 | $(KCONFIG_CONFIG) include/config/auto.conf.cmd: ; |
441 | 443 | ||
442 | # If .config is newer than include/config/auto.conf, someone tinkered | 444 | # If .config is newer than include/config/auto.conf, someone tinkered |
443 | # with it and forgot to run make oldconfig. | 445 | # with it and forgot to run make oldconfig. |
444 | # if auto.conf.cmd is missing then we are probarly in a cleaned tree so | 446 | # if auto.conf.cmd is missing then we are probarly in a cleaned tree so |
445 | # we execute the config step to be sure to catch updated Kconfig files | 447 | # we execute the config step to be sure to catch updated Kconfig files |
446 | include/config/auto.conf: .config include/config/auto.conf.cmd | 448 | include/config/auto.conf: $(KCONFIG_CONFIG) include/config/auto.conf.cmd |
447 | $(Q)$(MAKE) -f $(srctree)/Makefile silentoldconfig | 449 | $(Q)$(MAKE) -f $(srctree)/Makefile silentoldconfig |
448 | 450 | ||
449 | else | 451 | else |