diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2010-01-25 20:18:15 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2010-01-25 20:18:15 +0000 |
| commit | 245bd1861f236deb7a7e4cb5e2e400bf73f3afaa (patch) | |
| tree | ccadab70a29b3ee00945c35357ddd20da9363a96 /main/Makefile | |
| parent | fb65a6860ae03f48e233f0a50f1184343b41aad6 (diff) | |
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: https://origsvn.digium.com/svn/asterisk/trunk@242857 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/Makefile')
| -rw-r--r-- | main/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/Makefile b/main/Makefile index 9d75208da..98b142889 100644 --- a/main/Makefile +++ b/main/Makefile @@ -101,7 +101,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: @@ -109,7 +109,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: |