diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-17 12:53:07 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-17 12:53:07 -0500 |
| commit | 5cdddecc8b423308798453484149297a503e9cc0 (patch) | |
| tree | 671a6a2ade9904bf99437104fd71f609be780737 | |
| parent | ac0b50dd10ac0d30f2732eec0587f3632c2be725 (diff) | |
| parent | 971edcfc8bee41c0b41e21bf10751c5b22028a82 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/fix-kbuild
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/fix-kbuild:
kbuild: re-enable Makefile generation in a new O=... directory
| -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 @@ | |||
| 13 | test ! -r $2/Makefile -o -O $2/Makefile || exit 0 | 13 | test ! -r $2/Makefile -o -O $2/Makefile || exit 0 |
| 14 | # Only overwrite automatically generated Makefiles | 14 | # Only overwrite automatically generated Makefiles |
| 15 | # (so we do not overwrite kernel Makefile) | 15 | # (so we do not overwrite kernel Makefile) |
| 16 | if ! grep -q Automatically $2/Makefile | 16 | if test -e $2/Makefile && ! grep -q Automatically $2/Makefile |
| 17 | then | 17 | then |
| 18 | exit 0 | 18 | exit 0 |
| 19 | fi | 19 | fi |