Change the conditional of the outputmakefile rule to be evaluated entirely in make, and add a conditional to not touch the generated makefile when e.g. running 'make install' as root while the build was done as non-root. Also adjust the comment describing this, and move the message printing and redirection to mkmakefile.
Unified · Split
| @@ -344,16 +344,14 @@ scripts_basic: · 343 unmodified lines | ||
| 344 | 344 | scripts/basic/%: scripts_basic ; |
| 345 | 345 | |
| 346 | 346 | PHONY += outputmakefile |
| 347 | −# outputmakefile generate a Makefile to be placed in output directory, if | |
| 348 | −# using a seperate output directory. This allows convinient use | |
| 349 | −# of make in output directory | |
| 347 | +# outputmakefile generates a Makefile in the output directory, if using a | |
| 348 | +# separate output directory. This allows convenient use of make in the | |
| 349 | +# output directory. | |
| 350 | 350 | outputmakefile: |
| 351 | − $(Q)if test ! $(srctree) -ef $(objtree); then \ | |
| 352 | − $(CONFIG_SHELL) $(srctree)/scripts/mkmakefile \ | |
| 353 | − $(srctree) $(objtree) $(VERSION) $(PATCHLEVEL) \ | |
| 354 | − > $(objtree)/Makefile; \ | |
| 355 | − echo ' GEN $(objtree)/Makefile'; \ | |
| 356 | − fi | |
| 351 | +ifneq ($(KBUILD_SRC),) | |
| 352 | + $(Q)$(CONFIG_SHELL) $(srctree)/scripts/mkmakefile \ | |
| 353 | + $(srctree) $(objtree) $(VERSION) $(PATCHLEVEL) | |
| 354 | +endif | |
| 357 | 355 | |
| 358 | 356 | # To make sure we do not include .config for any of the *config targets |
| 359 | 357 | # catch them early, and hand them over to scripts/kconfig/Makefile |
| @@ -10,7 +10,10 @@ · 9 unmodified lines | ||
| 10 | 10 | # $4 - patchlevel |
| 11 | 11 | |
| 12 | 12 | |
| 13 | −cat << EOF | |
| 13 | +test ! -r $2/Makefile -o -O $2/Makefile || exit 0 | |
| 14 | +echo " GEN $2/Makefile" | |
| 15 | + | |
| 16 | +cat << EOF > $2/Makefile | |
| 14 | 17 | # Automatically generated by $0: don't edit |
| 15 | 18 | |
| 16 | 19 | VERSION = $3 |