aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSegher Boessenkool <segher@kernel.crashing.org>2007-05-16 08:49:22 -0400
committerPaul Mackerras <paulus@samba.org>2007-05-17 07:11:15 -0400
commit67ccd2fcd42333493a33993312c76fb2d4c2a2d6 (patch)
tree7d83b5aecfdd2ee191cbeb837ad8198789267a4a
parent8995ac8702737147115e1c75879a1a2d75627b9e (diff)
[POWERPC] Fix sed command lines for zlib source construction
Not every sed understands \+ so use the more portable * instead. Signed-off-by: Segher Boessenkool <segher@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r--arch/powerpc/boot/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
index 6d1f02fd2877..b0b570563f4d 100644
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@ -54,13 +54,13 @@ obj-wlib := $(addsuffix .o, $(basename $(addprefix $(obj)/, $(src-wlib))))
54obj-plat := $(addsuffix .o, $(basename $(addprefix $(obj)/, $(src-plat)))) 54obj-plat := $(addsuffix .o, $(basename $(addprefix $(obj)/, $(src-plat))))
55 55
56quiet_cmd_copy_zlib = COPY $@ 56quiet_cmd_copy_zlib = COPY $@
57 cmd_copy_zlib = sed "s@__attribute_used__@@;s@<linux/\([^>]\+\).*@\"\1\"@" $< > $@ 57 cmd_copy_zlib = sed "s@__attribute_used__@@;s@<linux/\([^>]*\).*@\"\1\"@" $< > $@
58 58
59quiet_cmd_copy_zlibheader = COPY $@ 59quiet_cmd_copy_zlibheader = COPY $@
60 cmd_copy_zlibheader = sed "s@<linux/\([^>]\+\).*@\"\1\"@" $< > $@ 60 cmd_copy_zlibheader = sed "s@<linux/\([^>]*\).*@\"\1\"@" $< > $@
61# stddef.h for NULL 61# stddef.h for NULL
62quiet_cmd_copy_zliblinuxheader = COPY $@ 62quiet_cmd_copy_zliblinuxheader = COPY $@
63 cmd_copy_zliblinuxheader = sed "s@<linux/string.h>@\"string.h\"@;s@<linux/kernel.h>@<stddef.h>@;s@<linux/\([^>]\+\).*@\"\1\"@" $< > $@ 63 cmd_copy_zliblinuxheader = sed "s@<linux/string.h>@\"string.h\"@;s@<linux/kernel.h>@<stddef.h>@;s@<linux/\([^>]*\).*@\"\1\"@" $< > $@
64 64
65$(addprefix $(obj)/,$(zlib)): $(obj)/%: $(srctree)/lib/zlib_inflate/% 65$(addprefix $(obj)/,$(zlib)): $(obj)/%: $(srctree)/lib/zlib_inflate/%
66 $(call cmd,copy_zlib) 66 $(call cmd,copy_zlib)