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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@242725 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/res/Makefile b/res/Makefile
index a8f764f8ac74df37b18b25926a8a9e67a81434b1..71ec72ddeb8dc0f1248a4c2724fee713b26af838 100644 (file)
--- 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