diff options
author | Tilghman Lesher <tilghman@meg.abyt.es> | 2010-01-25 05:45:00 +0000 |
---|---|---|
committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2010-01-25 05:45:00 +0000 |
commit | afb9fab574aa997749e67be1154edd187007a0aa (patch) | |
tree | bbc40232f1f9c72bcceb5f5a87350c5e1cc9245c /main | |
parent | 137046e459062896a59ecfc1bc1c1015124bc214 (diff) |
Merged revisions 242728 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r242728 | tilghman | 2010-01-24 23:42:22 -0600 (Sun, 24 Jan 2010) | 2 lines
Buildbot pointed out an error (thanks, buildbot!)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@242729 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
-rw-r--r-- | main/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/main/Makefile b/main/Makefile index 9630b635c..9d75208da 100644 --- a/main/Makefile +++ b/main/Makefile @@ -101,21 +101,21 @@ 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 ($(BISON),:) ast_expr2.c ast_expr2.h: ast_expr2.y else ast_expr2.c ast_expr2.h: endif $(ECHO_PREFIX) echo " [BISON] $< -> $@" - $(CMD_PREFIX) bison -o $@ -d --name-prefix=ast_yy ast_expr2.y + $(CMD_PREFIX) $(BISON) -o $@ -d --name-prefix=ast_yy ast_expr2.y -ifneq ($(FLEX),) +ifneq ($(FLEX),:) ast_expr2f.c: ast_expr2.fl else ast_expr2f.c: endif $(ECHO_PREFIX) echo " [FLEX] $< -> $@" - $(CMD_PREFIX) flex -o $@ ast_expr2.fl + $(CMD_PREFIX) $(FLEX) -o $@ ast_expr2.fl $(CMD_PREFIX) sed 's@#if __STDC_VERSION__ >= 199901L@#if !defined __STDC_VERSION__ || __STDC_VERSION__ >= 199901L@' $@ > $@.fix $(CMD_PREFIX) echo "#include \"asterisk.h\"" > $@ $(CMD_PREFIX) echo >> $@ |