diff options
| author | Sam Ravnborg <sam@ravnborg.org> | 2013-03-04 15:36:24 -0500 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2013-03-05 09:02:57 -0500 |
| commit | c4619bc6fa5149a6ab39be845a39142b6a996ea5 (patch) | |
| tree | 9cdc09cfe3a554b3e91cd4e1f79fd13eadff8a1d /scripts/Makefile.headersinst | |
| parent | 423a8155facf23719078ff63911c1e85ba40970b (diff) | |
kbuild: fix make headers_check with make 3.80
Commit 10b63956 ("UAPI: Plumb the UAPI Kbuilds into the user header
installation and checking") introduced a dependency of make 3.81
due to use of $(or ...)
We do not want to lift the requirement to gmake 3.81 just yet...
Included are a straightforward conversion to $(if ...)
Bisected-and-tested-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Cc: David Howells <dhowells@redhat.com>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Cc: <stable@vger.kernel.org> [v3.7+]
Signed-off-by: Michal Marek <mmarek@suse.cz>
Diffstat (limited to 'scripts/Makefile.headersinst')
| -rw-r--r-- | scripts/Makefile.headersinst | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index 25f216a841d5..477d137c0557 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst | |||
| @@ -14,7 +14,7 @@ kbuild-file := $(srctree)/$(obj)/Kbuild | |||
| 14 | include $(kbuild-file) | 14 | include $(kbuild-file) |
| 15 | 15 | ||
| 16 | # called may set destination dir (when installing to asm/) | 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 | old-kbuild-file := $(srctree)/$(subst uapi/,,$(obj))/Kbuild | 19 | old-kbuild-file := $(srctree)/$(subst uapi/,,$(obj))/Kbuild |
| 20 | ifneq ($(wildcard $(old-kbuild-file)),) | 20 | ifneq ($(wildcard $(old-kbuild-file)),) |
| @@ -48,13 +48,14 @@ all-files := $(header-y) $(genhdr-y) $(wrapper-files) | |||
| 48 | output-files := $(addprefix $(installdir)/, $(all-files)) | 48 | output-files := $(addprefix $(installdir)/, $(all-files)) |
| 49 | 49 | ||
| 50 | input-files := $(foreach hdr, $(header-y), \ | 50 | input-files := $(foreach hdr, $(header-y), \ |
| 51 | $(or \ | 51 | $(if $(wildcard $(srcdir)/$(hdr)), \ |
| 52 | $(wildcard $(srcdir)/$(hdr)), \ | 52 | $(wildcard $(srcdir)/$(hdr)), \ |
| 53 | $(wildcard $(oldsrcdir)/$(hdr)), \ | 53 | $(if $(wildcard $(oldsrcdir)/$(hdr)), \ |
| 54 | $(error Missing UAPI file $(srcdir)/$(hdr)) \ | 54 | $(wildcard $(oldsrcdir)/$(hdr)), \ |
| 55 | $(error Missing UAPI file $(srcdir)/$(hdr))) \ | ||
| 55 | )) \ | 56 | )) \ |
| 56 | $(foreach hdr, $(genhdr-y), \ | 57 | $(foreach hdr, $(genhdr-y), \ |
| 57 | $(or \ | 58 | $(if $(wildcard $(gendir)/$(hdr)), \ |
| 58 | $(wildcard $(gendir)/$(hdr)), \ | 59 | $(wildcard $(gendir)/$(hdr)), \ |
| 59 | $(error Missing generated UAPI file $(gendir)/$(hdr)) \ | 60 | $(error Missing generated UAPI file $(gendir)/$(hdr)) \ |
| 60 | )) | 61 | )) |