diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-25 20:24:30 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-25 20:24:30 +0000 |
| commit | 51188e459840af4dfb1af49f654c95feefa7be04 (patch) | |
| tree | 694fa7b972ed90916d215567ccdd31c568ec4368 /main | |
| parent | 3ca76344d15d97a110d1cbbe93093f2cc772a29c (diff) | |
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.2@242889 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/Makefile b/main/Makefile index dc536df59..d14a78abd 100644 --- a/main/Makefile +++ b/main/Makefile @@ -113,7 +113,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: @@ -121,7 +121,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: |