diff options
author | Guillaume Chazarain <guichaz@yahoo.fr> | 2007-12-11 13:22:08 +0100 |
---|---|---|
committer | Sam Ravnborg <sam@saturn.ravnborg.org> | 2007-12-13 19:19:20 +0100 |
commit | 971edcfc8bee41c0b41e21bf10751c5b22028a82 (patch) | |
tree | 074a2c5ab09fd0eeef49cff7a2bd9e564e397b4b /scripts | |
parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff) | |
download | linux-971edcfc8bee41c0b41e21bf10751c5b22028a82.tar.xz linux-971edcfc8bee41c0b41e21bf10751c5b22028a82.zip |
kbuild: re-enable Makefile generation in a new O=... directory
The commit:
18c32dac75b187d1a4e858f3cfdf03e844129f5e "kbuild: fix
building with O=.. options"
disabled the creation of a Makefile in a new O=... directory. Restore it.
Signed-off-by: Guillaume Chazarain <guichaz@yahoo.fr>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/mkmakefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/mkmakefile b/scripts/mkmakefile index 9ad1bd793252..e0f54b9d8fec 100644 --- a/scripts/mkmakefile +++ b/scripts/mkmakefile @@ -13,7 +13,7 @@ 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 +if test -e $2/Makefile && ! grep -q Automatically $2/Makefile then exit 0 fi |