summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Marek <mmarek@suse.cz>2014-07-04 22:53:52 +0200
committerMichal Marek <mmarek@suse.cz>2014-07-04 22:58:55 +0200
commitc79624c1a698a82747b1e6fe54cc7effa4c07aa5 (patch)
tree7c71d4f223f0b967cdc8098e43ffea95c2005f99
parentkbuild: Do not print the build directory with make -s (diff)
downloadlinux-c79624c1a698a82747b1e6fe54cc7effa4c07aa5.tar.xz
linux-c79624c1a698a82747b1e6fe54cc7effa4c07aa5.zip
kbuild: Fix packaging targets with relative $(srctree)
All other users of Makefile.build set $(obj) to the name of the subdirectory to build. Do the same for the packaging targets, otherwise the build fails if $(srctree) is a relative directory: $ make O=build tar-pkg make[1]: Entering directory `/home/mmarek/linux-2.6/build' CHK include/config/kernel.release ../scripts/Makefile.build:44: ../../scripts/package/Makefile: No such file or directory make[2]: *** No rule to make target `../../scripts/package/Makefile'. Stop. Fixes: 9da0763b ("kbuild: Use relative path when building in a subdir of the source tree") Signed-off-by: Michal Marek <mmarek@suse.cz>
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 1a5f9f3c7a58..347d6c7c7314 100644
--- a/Makefile
+++ b/Makefile
@@ -1176,7 +1176,7 @@ distclean: mrproper
# Packaging of the kernel to various formats
# ---------------------------------------------------------------------------
# rpm target kept for backward compatibility
-package-dir := $(srctree)/scripts/package
+package-dir := scripts/package
%src-pkg: FORCE
$(Q)$(MAKE) $(build)=$(package-dir) $@