diff --git a/[refs] b/[refs] index baaec8392af7..dbbdc44fa1a6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 03b25b47e0f4ebf3d37ace065c3847230ebdd27d +refs/heads/master: 9b58b9281d296d8e679e394d2aa5a02102dd8fe8 diff --git a/trunk/scripts/Makefile.headersinst b/trunk/scripts/Makefile.headersinst index 06ba4a70bd4d..25f216a841d5 100644 --- a/trunk/scripts/Makefile.headersinst +++ b/trunk/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)