From 3ca76344d15d97a110d1cbbe93093f2cc772a29c Mon Sep 17 00:00:00 2001 From: tilghman Date: Mon, 25 Jan 2010 05:46:53 +0000 Subject: Merged revisions 242729 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r242729 | tilghman | 2010-01-24 23:45:00 -0600 (Sun, 24 Jan 2010) | 9 lines Merged revisions 242728 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r242728 | tilghman | 2010-01-24 23:42:22 -0600 (Sun, 24 Jan 2010) | 2 lines Buildbot pointed out an error (thanks, buildbot!) ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@242732 f38db490-d61c-443f-a65b-d21fe96a405b --- res/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'res') diff --git a/res/Makefile b/res/Makefile index 1badb79e1..b842dec78 100644 --- a/res/Makefile +++ b/res/Makefile @@ -45,22 +45,22 @@ $(if $(filter res_snmp,$(EMBEDDED_MODS)),modules.link,res_snmp.so): snmp/agent.o $(if $(filter res_ael_share,$(EMBEDDED_MODS)),modules.link,res_ael_share.so): ael/ael_lex.o ael/ael.tab.o ael/pval.o -ifneq ($(FLEX),) +ifneq ($(FLEX),:) ael/ael_lex.c: ael/ael.flex 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; $(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),) +ifneq ($(BISON),:) ael/ael.tab.c ael/ael.tab.h: ael/ael.y else ael/ael.tab.c ael/ael.tab.h: endif $(ECHO_PREFIX) echo " [BISON] $< -> $@" - $(CMD_PREFIX) (cd ael; bison -v -d ael.y) + $(CMD_PREFIX) (cd ael; $(BISON) -v -d ael.y) ael/pval.o: ael/pval.c -- cgit v1.2.3