[PATCH] kbuild: Allow header_install to work with O=

[Ben Collins <ben.collins@ubuntu.com>]

Without this patch, doing:

make O=/foo/build INSTALL_HDR_PATH=/foo/install-headers headers_install

Doesn't work.

Signed-off-by: Ben Collins <bcollins@ubuntu.com>

---
 Makefile                     |    2 +-
 scripts/Makefile.headersinst |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 274b780..f9e3f61 100644
--- a/Makefile
+++ b/Makefile
@@ -932,7 +932,7 @@ headers_install_all: include/linux/versi
 
 PHONY += headers_install
 headers_install: include/linux/version.h scripts_basic FORCE
-	@if [ ! -r include/asm-$(ARCH)/Kbuild ]; then \
+	@if [ ! -r $(srctree)/include/asm-$(ARCH)/Kbuild ]; then \
 	  echo '*** Error: Headers not exportable for this architecture ($(ARCH))'; \
 	  exit 1 ; fi
 	$(Q)$(MAKE) $(build)=scripts scripts/unifdef
diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst
index 6a026f6..f1c3057 100644
--- a/scripts/Makefile.headersinst
+++ b/scripts/Makefile.headersinst
@@ -168,7 +168,7 @@ ifdef GENASM
 	$(call cmd,gen)
 
 else
-$(objhdr-y) :		$(INSTALL_HDR_PATH)/$(_dst)/%.h: $(srctree)/$(obj)/%.h $(KBUILDFILES)
+$(objhdr-y) :		$(INSTALL_HDR_PATH)/$(_dst)/%.h: $(obj)/%.h $(KBUILDFILES)
 	$(call cmd,o_hdr_install)
 
 $(header-y) :		$(INSTALL_HDR_PATH)/$(_dst)/%.h: $(srctree)/$(obj)/%.h $(KBUILDFILES)


-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/