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
This commit is contained in:
commit
5cdddecc8b
|
@ -13,7 +13,7 @@
|
||||||
test ! -r $2/Makefile -o -O $2/Makefile || exit 0
|
test ! -r $2/Makefile -o -O $2/Makefile || exit 0
|
||||||
# Only overwrite automatically generated Makefiles
|
# Only overwrite automatically generated Makefiles
|
||||||
# (so we do not overwrite kernel Makefile)
|
# (so we do not overwrite kernel Makefile)
|
||||||
if ! grep -q Automatically $2/Makefile
|
if test -e $2/Makefile && ! grep -q Automatically $2/Makefile
|
||||||
then
|
then
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue