From 8604f1b14ba81d9b4cab8741e6a541da56227c17 Mon Sep 17 00:00:00 2001 From: qwell Date: Tue, 11 May 2010 19:58:31 +0000 Subject: Merged revisions 262422 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r262422 | qwell | 2010-05-11 14:57:24 -0500 (Tue, 11 May 2010) | 18 lines 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 ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@262425 f38db490-d61c-443f-a65b-d21fe96a405b --- res/Makefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'res/Makefile') diff --git a/res/Makefile b/res/Makefile index aeb317004..c4b0cbcd2 100644 --- a/res/Makefile +++ b/res/Makefile @@ -51,8 +51,12 @@ else 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 -- cgit v1.2.3