path: root/scripts
diff options
authorJesper Nilsson <jesper.nilsson@axis.com>2013-02-02 11:18:35 +0100
committerMichal Marek <mmarek@suse.cz>2013-02-22 11:48:15 +0100
commit9b58b9281d296d8e679e394d2aa5a02102dd8fe8 (patch)
treead9dd0ab9c3f687e4e4453f4f60f04de549b2867 /scripts
parent03b25b47e0f4ebf3d37ace065c3847230ebdd27d (diff)
kbuild: Fix destination-y for installed headers
Commit 10b63956fce7f369cc37fd4d994f09bd5203efe4 which plumbed in UAPI broke the destination-y functionality of scripts/Makefile.headersinst. The variable destination-y is used in a := assignment and so is expanded at declaration time, and the include of the Kbuild fragments that set destination-y to something is after this time, so it now always expands empty. There are no in-tree users of destination-y, but it allows any Kbuild-fragment to redirect where headers are installed. Just move the assignment of the variable that uses it below the include of the Kbuild fragment. Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com> Cc: Michal Marek <mmarek@suse.cz> Cc: David Howells <dhowells@redhat.com> Signed-off-by: Michal Marek <mmarek@suse.cz>
Diffstat (limited to 'scripts')
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst
index 06ba4a70bd4..25f216a841d 100644
--- a/scripts/Makefile.headersinst
+++ b/scripts/Makefile.headersinst
@@ -7,15 +7,15 @@
# ==========================================================================
-# called may set destination dir (when installing to asm/)
-_dst := $(or $(destination-y),$(dst),$(obj))
# generated header directory
gen := $(if $(gen),$(gen),$(subst include/,include/generated/,$(obj)))
kbuild-file := $(srctree)/$(obj)/Kbuild
include $(kbuild-file)
+# called may set destination dir (when installing to asm/)
+_dst := $(or $(destination-y),$(dst),$(obj))
old-kbuild-file := $(srctree)/$(subst uapi/,,$(obj))/Kbuild
ifneq ($(wildcard $(old-kbuild-file)),)
include $(old-kbuild-file)