aboutsummaryrefslogtreecommitdiffstats
path: root/pbx
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2010-01-25 20:15:45 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2010-01-25 20:15:45 +0000
commit0e0abf9d1c97e272b9f72d6b96eb69eb62eba1b4 (patch)
treef118368712e9d2ee5f8b0649e2019231d2f42042 /pbx
parent6b4b10cc88b2d459ae002d08922666f07124963d (diff)
Restore FreeBSD to able-to-compile-ish-mode
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@242852 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'pbx')
-rw-r--r--pbx/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/pbx/Makefile b/pbx/Makefile
index a494de382..27c44b189 100644
--- a/pbx/Makefile
+++ b/pbx/Makefile
@@ -44,7 +44,7 @@ ael/ael.tab.o ael/ael_lex.o: _ASTCFLAGS+=$(MENUSELECT_OPTS_pbx_ael:%=-D%) $(fore
$(if $(filter pbx_ael,$(EMBEDDED_MODS)),modules.link,pbx_ael.so): ael/ael.tab.o ael/ael_lex.o
-ifneq ($(FLEX),:)
+ifneq ($(and $(findstring bison,$(BISON)),$(findstring flex,$(FLEX))),)
ael/ael_lex.c: ael/ael.flex
else
ael/ael_lex.c:
@@ -53,7 +53,7 @@ endif
$(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)
-ifneq ($(BISON),:)
+ifneq ($(and $(findstring bison,$(BISON)),$(findstring flex,$(FLEX))),)
ael/ael.tab.c ael/ael.tab.h: ael/ael.y
else
ael/ael.tab.c ael/ael.tab.h: