diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-25 05:46:38 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-25 05:46:38 +0000 |
| commit | 061a813b99f77d08be8a8b6812559ef503385475 (patch) | |
| tree | 496aa6a5a32fbdc10df790cdfc5d1f9d56dab798 /main | |
| parent | 94abbefbc3e4236d91dce3d388fb1ea71f707139 (diff) | |
Merged revisions 242729 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r242729 | tilghman | 2010-01-24 23:45:00 -0600 (Sun, 24 Jan 2010) | 9 lines
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@242730 f38db490-d61c-443f-a65b-d21fe96a405b
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 3ef5b3b07..14503e61d 100644 --- a/main/Makefile +++ b/main/Makefile @@ -104,21 +104,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 >> $@ |