Fix Makefile for newer versions of GNUmake.

Signed-off-by: Keir Fraser <keir@xen.org>

diff --git a/Makefile b/Makefile
index 2ff33d3a15befc7935dbebf21cf580df2475647f..468727e56fa5dbabee05750fd3f2d368986a32cc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -407,7 +407,11 @@ ifeq ($(config-targets),1)
 include $(srctree)/arch/$(ARCH)/Makefile
 export KBUILD_DEFCONFIG
 
-config %config: scripts_basic outputmakefile FORCE
+config: scripts_basic outputmakefile FORCE
+       $(Q)mkdir -p include/linux include/config
+       $(Q)$(MAKE) $(build)=scripts/kconfig $@
+
+%config: scripts_basic outputmakefile FORCE
        $(Q)mkdir -p include/linux include/config
        $(Q)$(MAKE) $(build)=scripts/kconfig $@
 
@@ -1380,7 +1384,10 @@ endif
        $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
 
 # Modules
-/ %/: prepare scripts FORCE
+/: prepare scripts FORCE
+       $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
+       $(build)=$(build-dir)
+%/: prepare scripts FORCE
        $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
        $(build)=$(build-dir)
 %.ko: prepare scripts FORCE

diff --git a/scripts/mkmakefile b/scripts/mkmakefile
index 7f9d544f9b6c07339021bdb80762feeb7b95f9bf..63ab04301b208ea37ae92f78786d99c9300b31f0 100644 (file)
--- a/scripts/mkmakefile
+++ b/scripts/mkmakefile
@@ -31,6 +31,8 @@ all:
 
 Makefile:;
 
-\$(filter-out all Makefile,\$(MAKECMDGOALS)) %/:
+\$(filter-out all Makefile,\$(MAKECMDGOALS)):
+       \$(MAKE) -C \$(KERNELSRC) O=\$(KERNELOUTPUT) \$@
+%/:
        \$(MAKE) -C \$(KERNELSRC) O=\$(KERNELOUTPUT) \$@
 EOF