We can always pass dst= from the top Makefile. This will simplify the logic in Makefile.headersinst.
Unified · Split
| @@ -1154,7 +1154,7 @@ PHONY += headers_install · 1153 unmodified lines | ||
| 1154 | 1154 | headers_install: __headers |
| 1155 | 1155 | $(if $(wildcard $(srctree)/arch/$(hdr-arch)/include/uapi/asm/Kbuild),, \ |
| 1156 | 1156 | $(error Headers not exportable for the $(SRCARCH) architecture)) |
| 1157 | − $(Q)$(MAKE) $(hdr-inst)=include/uapi | |
| 1157 | + $(Q)$(MAKE) $(hdr-inst)=include/uapi dst=include | |
| 1158 | 1158 | $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi $(hdr-dst) |
| 1159 | 1159 | |
| 1160 | 1160 | PHONY += headers_check_all |
| @@ -1163,7 +1163,7 @@ headers_check_all: headers_install_all · 2 unmodified lines | ||
| 1163 | 1163 | |
| 1164 | 1164 | PHONY += headers_check |
| 1165 | 1165 | headers_check: headers_install |
| 1166 | − $(Q)$(MAKE) $(hdr-inst)=include/uapi HDRCHECK=1 | |
| 1166 | + $(Q)$(MAKE) $(hdr-inst)=include/uapi dst=include HDRCHECK=1 | |
| 1167 | 1167 | $(Q)$(MAKE) $(hdr-inst)=arch/$(hdr-arch)/include/uapi $(hdr-dst) HDRCHECK=1 |
| 1168 | 1168 | |
| 1169 | 1169 | # --------------------------------------------------------------------------- |
| @@ -23,15 +23,12 @@ subdirs := $(patsubst $(srcdir)/%/,%,\ · 22 unmodified lines | ||
| 23 | 23 | $(filter-out $(srcdir)/,\ |
| 24 | 24 | $(sort $(dir $(wildcard $(srcdir)/*/))))) |
| 25 | 25 | |
| 26 | −# caller may set destination dir (when installing to asm/) | |
| 27 | −_dst := $(if $(dst),$(dst),$(obj)) | |
| 28 | − | |
| 29 | 26 | # Recursion |
| 30 | 27 | __headers: $(subdirs) |
| 31 | 28 | |
| 32 | 29 | .PHONY: $(subdirs) |
| 33 | 30 | $(subdirs): |
| 34 | − $(Q)$(MAKE) $(hdr-inst)=$(obj)/$@ dst=$(_dst)/$@ | |
| 31 | + $(Q)$(MAKE) $(hdr-inst)=$(obj)/$@ dst=$(dst)/$@ | |
| 35 | 32 | |
| 36 | 33 | # Skip header install/check for include/uapi and arch/$(hdr-arch)/include/uapi. |
| 37 | 34 | # We have only sub-directories there. |
| @@ -48,8 +45,7 @@ ifneq ($(wildcard $(old-kbuild-file)),) · 10 unmodified lines | ||
| 48 | 45 | include $(old-kbuild-file) |
| 49 | 46 | endif |
| 50 | 47 | |
| 51 | −installdir := $(INSTALL_HDR_PATH)/$(subst uapi/,,$(_dst)) | |
| 52 | − | |
| 48 | +installdir := $(INSTALL_HDR_PATH)/$(dst) | |
| 53 | 49 | gendir := $(objtree)/$(subst include/,include/generated/,$(obj)) |
| 54 | 50 | header-files := $(notdir $(wildcard $(srcdir)/*.h)) |
| 55 | 51 | header-files += $(notdir $(wildcard $(srcdir)/*.agh)) |