| From 3c955b407a084810f57260d61548cc92c14bc627 Mon Sep 17 00:00:00 2001 |
| From: Jan Beulich <JBeulich@novell.com> |
| Date: Mon, 16 Aug 2010 11:58:58 +0100 |
| Subject: fixes for using make 3.82 |
| |
| From: Jan Beulich <JBeulich@novell.com> |
| |
| 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> |
| |
| --- |
| firmware/Makefile | 2 +- |
| scripts/mkmakefile | 4 +++- |
| 2 files changed, 4 insertions(+), 2 deletions(-) |
| |
| --- a/firmware/Makefile |
| +++ b/firmware/Makefile |
| @@ -141,7 +141,7 @@ fw-shipped-$(CONFIG_YAM) += yam/1200.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 $@ |
| --- a/scripts/mkmakefile |
| +++ b/scripts/mkmakefile |
| @@ -44,7 +44,9 @@ all: |
| |
| Makefile:; |
| |
| -\$(all) %/: all |
| +\$(all): all |
| @: |
| |
| +%/: all |
| + @: |
| EOF |
