aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2007-12-11 15:30:27 +1100
committerPaul Mackerras <paulus@samba.org>2007-12-11 15:30:27 +1100
commitcfad589f565bdaa69d45fb1c0db124727a6eaf6e (patch)
tree0582935064aa9e6ba0c80efaf6c0ef35ff8c3867 /scripts
parent[POWERPC] Update smu command definitions (diff)
parentMerge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 (diff)
Merge branch 'linux-2.6' into for-2.6.25
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