aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-20 11:40:43 -0500
committerIngo Molnar <mingo@elte.hu>2009-02-20 11:40:43 -0500
commit3b6f7b9beb553ea71a6d4d76ba82cf32eb6dadd2 (patch)
tree2cd8a8d61f350aa3b00e6b0afc998544923f183e /Makefile
parent9be1b56a3e718aa998772019c57c398dbb19e258 (diff)
parent07a66d7c53a538e1a9759954a82bb6c07365eff9 (diff)
Merge branch 'x86/urgent' into x86/core
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index b280cfcf1efe..96628d0b48d2 100644
--- a/Makefile
+++ b/Makefile
@@ -389,6 +389,7 @@ PHONY += outputmakefile
389# output directory. 389# output directory.
390outputmakefile: 390outputmakefile:
391ifneq ($(KBUILD_SRC),) 391ifneq ($(KBUILD_SRC),)
392 $(Q)ln -fsn $(srctree) source
392 $(Q)$(CONFIG_SHELL) $(srctree)/scripts/mkmakefile \ 393 $(Q)$(CONFIG_SHELL) $(srctree)/scripts/mkmakefile \
393 $(srctree) $(objtree) $(VERSION) $(PATCHLEVEL) 394 $(srctree) $(objtree) $(VERSION) $(PATCHLEVEL)
394endif 395endif
@@ -947,7 +948,6 @@ ifneq ($(KBUILD_SRC),)
947 mkdir -p include2; \ 948 mkdir -p include2; \
948 ln -fsn $(srctree)/include/asm-$(SRCARCH) include2/asm; \ 949 ln -fsn $(srctree)/include/asm-$(SRCARCH) include2/asm; \
949 fi 950 fi
950 ln -fsn $(srctree) source
951endif 951endif
952 952
953# prepare2 creates a makefile if using a separate output directory 953# prepare2 creates a makefile if using a separate output directory