summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorSam Ravnborg <sam@saturn.ravnborg.org>2007-12-09 10:55:13 +0300
committerSam Ravnborg <sam@saturn.ravnborg.org>2007-12-09 10:55:13 +0300
commit18c32dac75b187d1a4e858f3cfdf03e844129f5e (patch)
treec41a33a7077356c0e75fcbe40ecb49890d506051 /scripts
parent1cacc9ab8bf10e60b3ed93d7a10b070c4cbc6c9f (diff)
downloadlinux-18c32dac75b187d1a4e858f3cfdf03e844129f5e.tar.xz
kbuild: fix building with O=.. options
The check introduced in commit: 4f1127e204377cbd2a56d112d323466f668e8334 "kbuild: fix infinite make recursion" caused certain external modules not to build and also caused 'make targz-pkg' to fail. This is a minimal fix so we revert to previous behaviour - but we do not overwrite the Makefile in the top-level directory. Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Tested-by: Jay Cliburn <jacliburn@bellsouth.net> Cc: Jay Cliburn <jacliburn@bellsouth.net>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/mkmakefile6
1 files changed, 6 insertions, 0 deletions
diff --git a/scripts/mkmakefile b/scripts/mkmakefile
index ee39facee152..9ad1bd793252 100644
--- a/scripts/mkmakefile
+++ b/scripts/mkmakefile
@@ -11,6 +11,12 @@
test ! -r $2/Makefile -o -O $2/Makefile || exit 0
+# Only overwrite automatically generated Makefiles
+# (so we do not overwrite kernel Makefile)
+if ! grep -q Automatically $2/Makefile
+then
+ exit 0
+fi
echo " GEN $2/Makefile"
cat << EOF > $2/Makefile