From b6f302dfc0bb4df03e304a19a7f5180a2758d3de Mon Sep 17 00:00:00 2001 From: "Markus F.X.J. Oberhumer" Date: Mon, 30 Jul 2007 12:56:35 +0200 Subject: [PATCH] Makefile: use /bin/echo for better portability. --- src/stub/Makefile | 2 ++ src/stub/src/arch/i086/Makefile.extra | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/stub/Makefile b/src/stub/Makefile index 2821a88e..b1c9ca64 100644 --- a/src/stub/Makefile +++ b/src/stub/Makefile @@ -152,6 +152,8 @@ tc_list = tc_objdump_disasm_options = # commands +ECHO_e = /bin/echo -e +ECHO_E = /bin/echo -E PERL = perl PYTHON = python UNIX2DOS := $(PERL) -i -pe 's/$$/\r/;' diff --git a/src/stub/src/arch/i086/Makefile.extra b/src/stub/src/arch/i086/Makefile.extra index d6ee3e5e..0b24c8bb 100644 --- a/src/stub/src/arch/i086/Makefile.extra +++ b/src/stub/src/arch/i086/Makefile.extra @@ -55,16 +55,16 @@ endif # work around limitations of wine's cmd.exe define mkbat - echo -E '@set PATH=$3;%PATH%' > $1 - echo -E '@set INCLUDE=$4' >> $1 - echo -E '@set LIB=$5' >> $1 - echo -E '@set a=%1 %2 %3 %4 %5 %6 %7 %8 %9' >> $1 - echo -e '@shift\n@shift\n@shift\n@shift\n@shift' >> $1 - echo -e '@shift\n@shift\n@shift\n@shift' >> $1 - echo -E '@set b=%1 %2 %3 %4 %5 %6 %7 %8 %9' >> $1 - echo -e '@shift\n@shift\n@shift\n@shift\n@shift' >> $1 - echo -e '@shift\n@shift\n@shift\n@shift' >> $1 - echo -E '$2 %a% %b% %1 %2 %3 %4 %5 %6 %7 %8 %9' >> $1 + $(ECHO_E) '@set PATH=$3;%PATH%' > $1 + $(ECHO_E) '@set INCLUDE=$4' >> $1 + $(ECHO_E) '@set LIB=$5' >> $1 + $(ECHO_E) '@set a=%1 %2 %3 %4 %5 %6 %7 %8 %9' >> $1 + $(ECHO_e) '@shift\n@shift\n@shift\n@shift\n@shift' >> $1 + $(ECHO_e) '@shift\n@shift\n@shift\n@shift' >> $1 + $(ECHO_E) '@set b=%1 %2 %3 %4 %5 %6 %7 %8 %9' >> $1 + $(ECHO_e) '@shift\n@shift\n@shift\n@shift\n@shift' >> $1 + $(ECHO_e) '@shift\n@shift\n@shift\n@shift' >> $1 + $(ECHO_E) '$2 %a% %b% %1 %2 %3 %4 %5 %6 %7 %8 %9' >> $1 $(UNIX2DOS) $1 endef