diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-25 05:35:19 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-25 05:35:19 +0000 |
| commit | 94abbefbc3e4236d91dce3d388fb1ea71f707139 (patch) | |
| tree | 45bd73db6c0f16cc815701c27201de10282492b7 /res | |
| parent | fdd073384fe30211d58424c9d1c759de3e19ad66 (diff) | |
Merged revisions 242724 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r242724 | tilghman | 2010-01-24 23:34:33 -0600 (Sun, 24 Jan 2010) | 9 lines
Merged revisions 242723 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r242723 | tilghman | 2010-01-24 23:33:37 -0600 (Sun, 24 Jan 2010) | 2 lines
Oops, should have used CMD_PREFIX, not ECHO_PREFIX, for the commands.
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@242725 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
| -rw-r--r-- | res/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/res/Makefile b/res/Makefile index a8f764f8a..71ec72dde 100644 --- a/res/Makefile +++ b/res/Makefile @@ -45,8 +45,8 @@ else ael/ael_lex.c: endif $(ECHO_PREFIX) echo " [FLEX] $< -> $@" - $(ECHO_PREFIX) (cd ael; flex ael.flex; sed -e "/begin standard C headers/i#include \"asterisk.h\"" ael_lex.c > zz; mv zz 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 -e "/begin standard C headers/i#include \"asterisk.h\"" ael_lex.c > zz; mv zz 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 @@ -54,7 +54,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) ael/pval.o: ael/pval.c |