From 90485b96be50e6ee811f3ba3c16e2369a2e8b6cd Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Mon, 2 Apr 2007 19:04:50 +0000 Subject: ok, I think I finally nailed this stupid sh vs. echo -e bug svn path=/trunk/externals/miXed/; revision=7535 --- toxy/Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'toxy') diff --git a/toxy/Makefile b/toxy/Makefile index 5527532..1c06f5b 100644 --- a/toxy/Makefile +++ b/toxy/Makefile @@ -1,6 +1,12 @@ ROOT_DIR = .. WIDPATH = $(ROOT_DIR)/test/toxy/setup.wid WIQFILE = $(notdir $(WIDPATH:.wid=.wiq)) +# this is necessary to deal with cross-platform echo issues with '-e' +ifeq ($(shell echo -e|sed 's|^-||'),e) + ECHO = /bin/echo +else + ECHO = echo +endif redefault: checkwiq $(WIQFILE) default checkwiq: @if [ -f $(WIQFILE) ] && ! [ -s $(WIQFILE) ] ; then \ @@ -9,7 +15,7 @@ checkwiq: $(WIQFILE): $(WIDPATH) @echo transferring widget definitions from \"$<\" to \"$@\" # LATER think how to replace puts with pdtk_post - @echo '// Do not edit this file (edit "$<", and run "make").\n//\nputs stderr [concat loading built-in widget definitions]' \ + $(ECHO) -e '// Do not edit this file (edit "$<", and run "make").\n//\nputs stderr [concat loading built-in widget definitions]' \ | cat - $< | sed \ -e '1,\|//$$|{p;d;}' \ -e 's/\([\\\"]\)/\\\1/g' \ -- cgit v1.2.1