kbuild: change kbuild to not rely on incorrect GNU make behavior

[mirror_ubuntu-artful-kernel.git] / scripts / package / Makefile

diff --git a/scripts/package/Makefile b/scripts/package/Makefile
index fbb8cf5d4e19d423d138c4d028293e5e8e151a91..d3038b7643ae6c21f84828e4e1cbbb26d4e8b7cc 100644 (file)
--- a/scripts/package/Makefile
+++ b/scripts/package/Makefile
@@ -32,7 +32,7 @@ MKSPEC     := $(srctree)/scripts/package/mkspec
 PREV       := set -e; cd ..;
 
 # rpm-pkg
-.PHONY: rpm-pkg rpm
+PHONY += rpm-pkg rpm
 
 $(objtree)/kernel.spec: $(MKSPEC) $(srctree)/Makefile
        $(CONFIG_SHELL) $(MKSPEC) > $@
@@ -54,12 +54,12 @@ rpm-pkg rpm: $(objtree)/kernel.spec
 clean-files := $(objtree)/kernel.spec
 
 # binrpm-pkg
-.PHONY: binrpm-pkg
+PHONY += binrpm-pkg
 $(objtree)/binkernel.spec: $(MKSPEC) $(srctree)/Makefile
        $(CONFIG_SHELL) $(MKSPEC) prebuilt > $@
-       
+
 binrpm-pkg: $(objtree)/binkernel.spec
-       $(MAKE)
+       $(MAKE) KBUILD_SRC=
        set -e; \
        $(CONFIG_SHELL) $(srctree)/scripts/mkversion > $(objtree)/.tmp_version
        set -e; \
@@ -72,9 +72,9 @@ clean-files += $(objtree)/binkernel.spec
 # Deb target
 # ---------------------------------------------------------------------------
 #
-.PHONY: deb-pkg
+PHONY += deb-pkg
 deb-pkg:
-       $(MAKE)
+       $(MAKE) KBUILD_SRC=
        $(CONFIG_SHELL) $(srctree)/scripts/package/builddeb
 
 clean-dirs += $(objtree)/debian/
@@ -82,9 +82,9 @@ clean-dirs += $(objtree)/debian/
 
 # tarball targets
 # ---------------------------------------------------------------------------
-.PHONY: tar%pkg
+PHONY += tar%pkg
 tar%pkg:
-       $(MAKE)
+       $(MAKE) KBUILD_SRC=
        $(CONFIG_SHELL) $(srctree)/scripts/package/buildtar $@
 
 clean-dirs += $(objtree)/tar-install/
@@ -94,7 +94,8 @@ clean-dirs += $(objtree)/tar-install/
 # ---------------------------------------------------------------------------
 help:
        @echo '  rpm-pkg         - Build the kernel as an RPM package'
-       @echo '  binrpm-pkg      - Build an rpm package containing the compiled kernel & modules'
+       @echo '  binrpm-pkg      - Build an rpm package containing the compiled kernel'
+       @echo '                    and modules'
        @echo '  deb-pkg         - Build the kernel as an deb package'
        @echo '  tar-pkg         - Build the kernel as an uncompressed tarball'
        @echo '  targz-pkg       - Build the kernel as a gzip compressed tarball'