tjh.dev
+6
-5
scripts/Makefile.headersinst
+6
-5
scripts/Makefile.headersinst
···
14
14
include $(kbuild-file)
15
15
16
16
# called may set destination dir (when installing to asm/)
17
-
_dst := $(or $(destination-y),$(dst),$(obj))
17
+
_dst := $(if $(destination-y),$(destination-y),$(if $(dst),$(dst),$(obj)))
18
18
19
19
old-kbuild-file := $(srctree)/$(subst uapi/,,$(obj))/Kbuild
20
20
ifneq ($(wildcard $(old-kbuild-file)),)
···
48
48
output-files := $(addprefix $(installdir)/, $(all-files))
49
49
50
50
input-files := $(foreach hdr, $(header-y), \
51
-
$(or \
51
+
$(if $(wildcard $(srcdir)/$(hdr)), \
52
52
$(wildcard $(srcdir)/$(hdr)), \
53
-
$(wildcard $(oldsrcdir)/$(hdr)), \
54
-
$(error Missing UAPI file $(srcdir)/$(hdr)) \
53
+
$(if $(wildcard $(oldsrcdir)/$(hdr)), \
54
+
$(wildcard $(oldsrcdir)/$(hdr)), \
55
+
$(error Missing UAPI file $(srcdir)/$(hdr))) \
55
56
)) \
56
57
$(foreach hdr, $(genhdr-y), \
57
-
$(or \
58
+
$(if $(wildcard $(gendir)/$(hdr)), \
58
59
$(wildcard $(gendir)/$(hdr)), \
59
60
$(error Missing generated UAPI file $(gendir)/$(hdr)) \
60
61
))