[svn-commits] qwell: trunk r262422 - in /trunk: ./ res/Makefile

Tue May 11 14:57:28 CDT 2010

Author: qwell
Date: Tue May 11 14:57:24 2010
New Revision: 262422

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=262422
Log:
Merged revisions 262421 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r262421 | qwell | 2010-05-11 14:55:42 -0500 (Tue, 11 May 2010) | 11 lines
  
  Use a less silly method for modifying a flex-generated file.
  
  The sed syntax that was used wasn't actually valid, causing some versions to
  choke.  This is the method that is used in 1.6.x+ for similar changes.
  
  (closes issue #16696)
  Reported by: bklang
  Patches: 
        16696-sedfix.diff uploaded by qwell (license 4)
  Tested by: qwell
........

Modified:
    trunk/   (props changed)
    trunk/res/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/res/Makefile
URL: http://svnview.digium.com/svn/asterisk/trunk/res/Makefile?view=diff&rev=262422&r1=262421&r2=262422
==============================================================================

--- trunk/res/Makefile (original)
+++ trunk/res/Makefile Tue May 11 14:57:24 2010
@@ -52,8 +52,12 @@
 ael/ael_lex.c:
 endif
 	$(ECHO_PREFIX) echo "   [FLEX] $< -> $@"
-	$(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)
+	$(CMD_PREFIX) (cd ael; $(FLEX) ael.flex)
+	$(CMD_PREFIX) sed 's@#if __STDC_VERSION__ >= 199901L@#if !defined __STDC_VERSION__ || __STDC_VERSION__ >= 199901L@' $@ > $@.fix
+	$(CMD_PREFIX) echo "#include \"asterisk.h\"" > $@
+	$(CMD_PREFIX) echo >> $@
+	$(CMD_PREFIX) cat $@.fix >> $@
+	$(CMD_PREFIX) rm $@.fix
 
 ifneq ($(findstring REBUILD_PARSERS,$(MENUSELECT_CFLAGS)),)
 ael/ael.tab.c ael/ael.tab.h: ael/ael.y


