From: Jason Parker <jparker@digium.com>
Date: Tue, 11 May 2010 19:55:42 +0000 (+0000)
Subject: Use a less silly method for modifying a flex-generated file.
X-Git-Tag: 1.4.33-rc1~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f91e893ebe416195fe78620b244480ac12f40c8;p=thirdparty%2Fasterisk.git

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@262421 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/pbx/Makefile b/pbx/Makefile
index be79b26bd5..3ed3d9e5ae 100644
--- a/pbx/Makefile
+++ b/pbx/Makefile
@@ -50,8 +50,12 @@ else
 ael/ael_lex.c:
 endif
 	$(ECHO_PREFIX) echo "   [FLEX] $< -> $@"
-	$(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)
+	$(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