diff options
| author | Jan Beulich <JBeulich@novell.com> | 2010-08-16 11:58:58 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-26 16:40:12 -0700 |
| commit | 346767e3c92722f478fc80d863d6e2d1c6fd396e (patch) | |
| tree | abaf07a4894b39b753c3339feb93c2088184799f | |
| parent | aa184a2b0bd3c74ba099853ed39b11acdc109d8f (diff) | |
fixes for using make 3.82
commit 3c955b407a084810f57260d61548cc92c14bc627 upstream.
It doesn't like pattern and explicit rules to be on the same line,
and it seems to be more picky when matching file (or really directory)
names with different numbers of trailing slashes.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Andrew Benton <b3nton@gmail.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | firmware/Makefile | 2 | ||||
| -rw-r--r-- | scripts/mkmakefile | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/firmware/Makefile b/firmware/Makefile index da75a6fbc6ba..5c01761f1bc7 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -75,7 +75,7 @@ fw-shipped-$(CONFIG_VIDEO_CPIA2) += cpia2/stv0672_vp4.bin fw-shipped-all := $(fw-shipped-y) $(fw-shipped-m) $(fw-shipped-) # Directories which we _might_ need to create, so we have a rule for them. -firmware-dirs := $(sort $(patsubst %,$(objtree)/$(obj)/%/,$(dir $(fw-external-y) $(fw-shipped-all)))) +firmware-dirs := $(sort $(addprefix $(objtree)/$(obj)/,$(dir $(fw-external-y) $(fw-shipped-all)))) quiet_cmd_mkdir = MKDIR $(patsubst $(objtree)/%,%,$@) cmd_mkdir = mkdir -p $@ diff --git a/scripts/mkmakefile b/scripts/mkmakefile index e65d8b33faa4..278b64ef21b5 100644 --- a/scripts/mkmakefile +++ b/scripts/mkmakefile @@ -42,7 +42,9 @@ all: Makefile:; -\$(all) %/: all +\$(all): all @: +%/: all + @: EOF |