diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-12-11 15:30:27 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-12-11 15:30:27 +1100 |
| commit | cfad589f565bdaa69d45fb1c0db124727a6eaf6e (patch) | |
| tree | 0582935064aa9e6ba0c80efaf6c0ef35ff8c3867 /scripts | |
| parent | bc625f20c08c5a5438a9fa3bb6d67fd84b1bab4b (diff) | |
| parent | 437105f2a7f23899fd647e7ada683ba8dacf11ba (diff) | |
Merge branch 'linux-2.6' into for-2.6.25
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mkmakefile | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/scripts/mkmakefile b/scripts/mkmakefile index ee39facee15..9ad1bd79325 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 |