From: Tilghman Lesher Date: Mon, 25 Jan 2010 05:33:37 +0000 (+0000) Subject: Oops, should have used CMD_PREFIX, not ECHO_PREFIX, for the commands. X-Git-Tag: 1.4.30-rc2~5^2~17 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae335a79b2070e7a9eec4174c9e297d1ed6ea332;p=thirdparty%2Fasterisk.git Oops, should have used CMD_PREFIX, not ECHO_PREFIX, for the commands. git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@242723 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/main/Makefile b/main/Makefile index 1a182ed906..a1e6a2f412 100644 --- a/main/Makefile +++ b/main/Makefile @@ -101,7 +101,7 @@ else ast_expr2.c ast_expr2.h: endif $(ECHO_PREFIX) echo " [BISON] $< -> $@" - $(ECHO_PREFIX) bison -o $@ -d --name-prefix=ast_yy ast_expr2.y + $(CMD_PREFIX) bison -o $@ -d --name-prefix=ast_yy ast_expr2.y ifneq ($(FLEX),) ast_expr2f.c: ast_expr2.fl @@ -109,9 +109,9 @@ else ast_expr2f.c: endif $(ECHO_PREFIX) echo " [FLEX] $< -> $@" - $(ECHO_PREFIX) flex -o $@ ast_expr2.fl # moved the correction of yyfree into the flex input file itself. - $(ECHO_PREFIX) sed 's@#if __STDC_VERSION__ >= 199901L@#if !defined __STDC_VERSION__ || __STDC_VERSION__ >= 199901L@' ast_expr2f.c > zz - $(ECHO_PREFIX) mv zz ast_expr2f.c + $(CMD_PREFIX) flex -o $@ ast_expr2.fl # moved the correction of yyfree into the flex input file itself. + $(CMD_PREFIX) sed 's@#if __STDC_VERSION__ >= 199901L@#if !defined __STDC_VERSION__ || __STDC_VERSION__ >= 199901L@' ast_expr2f.c > zz + $(CMD_PREFIX) mv zz ast_expr2f.c ast_expr2f.o: _ASTCFLAGS+=-Wno-unused diff --git a/pbx/Makefile b/pbx/Makefile index e40a38998b..a1a8aaa043 100644 --- a/pbx/Makefile +++ b/pbx/Makefile @@ -50,8 +50,8 @@ else ael/ael_lex.c: endif $(ECHO_PREFIX) echo " [FLEX] $< -> $@" - $(ECHO_PREFIX) (cd ael; flex ael.flex; sed -i -e "/begin standard C headers/i#include \"asterisk.h\"" ael_lex.c) - $(ECHO_PREFIX) (cd ael; sed 's@#if __STDC_VERSION__ >= 199901L@#if !defined __STDC_VERSION__ || __STDC_VERSION__ >= 199901L@' ael_lex.c > zz; mv zz ael_lex.c) + $(CMD_PREFIX) (cd ael; flex ael.flex; sed -i -e "/begin standard C headers/i#include \"asterisk.h\"" ael_lex.c) + $(CMD_PREFIX) (cd ael; sed 's@#if __STDC_VERSION__ >= 199901L@#if !defined __STDC_VERSION__ || __STDC_VERSION__ >= 199901L@' ael_lex.c > zz; mv zz ael_lex.c) ifneq ($(BISON),) ael/ael.tab.c ael/ael.tab.h: ael/ael.y @@ -59,7 +59,7 @@ else ael/ael.tab.c ael/ael.tab.h: endif $(ECHO_PREFIX) echo " [BISON] $< -> $@" - $(ECHO_PREFIX) (cd ael; bison -v -d ael.y) + $(CMD_PREFIX) (cd ael; bison -v -d ael.y) dundi-parser.o: dundi-parser.h dundi-parser.o: _ASTCFLAGS+=-I.