From d82adf08c7958dede2e688e65a62b510d5b8d991 Mon Sep 17 00:00:00 2001
From: tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>
Date: Mon, 25 Jan 2010 20:24:11 +0000
Subject: Merged revisions 242857 via svnmerge from
 https://origsvn.digium.com/svn/asterisk/trunk

................
  r242857 | tilghman | 2010-01-25 14:18:15 -0600 (Mon, 25 Jan 2010) | 9 lines

  Merged revisions 242852 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r242852 | tilghman | 2010-01-25 14:15:45 -0600 (Mon, 25 Jan 2010) | 2 lines

    Restore FreeBSD to able-to-compile-ish-mode
  ........
................


git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@242885 f38db490-d61c-443f-a65b-d21fe96a405b
---
 main/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'main')

diff --git a/main/Makefile b/main/Makefile
index 14503e61d..f5b796c5e 100644
--- a/main/Makefile
+++ b/main/Makefile
@@ -104,7 +104,7 @@ editline/libedit.a: CHECK_SUBDIR
 db1-ast/libdb1.a: CHECK_SUBDIR
 	_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:
@@ -112,7 +112,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:
-- 
cgit v1.2.3