aboutsummaryrefslogtreecommitdiffstats
path: root/main
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 /main
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 'main')
-rw-r--r--main/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/main/Makefile b/main/Makefile
index dd90f7f3d..71f898a63 100644
--- a/main/Makefile
+++ b/main/Makefile
@@ -95,7 +95,7 @@ editline/libedit.a:
db1-ast/libdb1.a:
_ASTCFLAGS="$(_ASTCFLAGS)" ASTCFLAGS="$(ASTCFLAGS) -Wno-strict-aliasing" $(MAKE) -C db1-ast libdb1.a
-ifneq ($(BISON),:)
+ifneq ($(and $(findstring bison,$(BISON)),$(findstring flex,$(FLEX))),)
ast_expr2.c ast_expr2.h: ast_expr2.y
else
ast_expr2.c ast_expr2.h:
@@ -103,7 +103,7 @@ endif
$(ECHO_PREFIX) echo " [BISON] $< -> $@"
$(CMD_PREFIX) $(BISON) -o $@ -d --name-prefix=ast_yy ast_expr2.y
-ifneq ($(FLEX),:)
+ifneq ($(and $(findstring bison,$(BISON)),$(findstring flex,$(FLEX))),)
ast_expr2f.c: ast_expr2.fl
else
ast_expr2f.c: