[asterisk-commits] tilghman: branch 1.6.0 r242725 - in /branches/1.6.0: ./ res/Makefile

Sun Jan 24 23:35:23 CST 2010

Author: tilghman
Date: Sun Jan 24 23:35:19 2010
New Revision: 242725

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=242725
Log:
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.
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/res/Makefile

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/res/Makefile
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/res/Makefile?view=diff&rev=242725&r1=242724&r2=242725
==============================================================================

--- branches/1.6.0/res/Makefile (original)
+++ branches/1.6.0/res/Makefile Sun Jan 24 23:35:19 2010
@@ -45,8 +45,8 @@
 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 @@
 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
 


