diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-25 05:42:22 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-25 05:42:22 +0000 |
| commit | afcac316df44f74f76c25477f3e264829173d72e (patch) | |
| tree | 6c4ed7917f51a7b123ebd83f60e6752b828b14a2 | |
| parent | 70e2d65f49ec4cdad8ef222c845f5ab074d5b0c8 (diff) | |
Buildbot pointed out an error (thanks, buildbot!)
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@242728 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | main/Makefile | 8 | ||||
| -rw-r--r-- | pbx/Makefile | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/main/Makefile b/main/Makefile index a1e6a2f41..dd90f7f3d 100644 --- a/main/Makefile +++ b/main/Makefile @@ -95,21 +95,21 @@ editline/libedit.a: db1-ast/libdb1.a: _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 # moved the correction of yyfree into the flex input file itself. + $(CMD_PREFIX) $(FLEX) -o $@ ast_expr2.fl # moved the correction of yyfree into the flex input file itself. $(CMD_PREFIX) sed 's@#if __STDC_VERSION__ >= 199901L@#if !defined __STDC_VERSION__ || __STDC_VERSION__ >= 199901L@' ast_expr2f.c > zz $(CMD_PREFIX) mv zz ast_expr2f.c diff --git a/pbx/Makefile b/pbx/Makefile index a1a8aaa04..a494de382 100644 --- a/pbx/Makefile +++ b/pbx/Makefile @@ -44,22 +44,22 @@ ael/ael.tab.o ael/ael_lex.o: _ASTCFLAGS+=$(MENUSELECT_OPTS_pbx_ael:%=-D%) $(fore $(if $(filter pbx_ael,$(EMBEDDED_MODS)),modules.link,pbx_ael.so): ael/ael.tab.o ael/ael_lex.o -ifneq ($(FLEX),) +ifneq ($(FLEX),:) ael/ael_lex.c: ael/ael.flex else ael/ael_lex.c: endif $(ECHO_PREFIX) echo " [FLEX] $< -> $@" - $(CMD_PREFIX) (cd ael; flex ael.flex; sed -i -e "/begin standard C headers/i#include \"asterisk.h\"" ael_lex.c) + $(CMD_PREFIX) (cd ael; $(FLEX) ael.flex; sed -i -e "/begin standard C headers/i#include \"asterisk.h\"" ael_lex.c) $(CMD_PREFIX) (cd ael; sed 's@#if __STDC_VERSION__ >= 199901L@#if !defined __STDC_VERSION__ || __STDC_VERSION__ >= 199901L@' ael_lex.c > zz; mv zz ael_lex.c) -ifneq ($(BISON),) +ifneq ($(BISON),:) ael/ael.tab.c ael/ael.tab.h: ael/ael.y else ael/ael.tab.c ael/ael.tab.h: endif $(ECHO_PREFIX) echo " [BISON] $< -> $@" - $(CMD_PREFIX) (cd ael; bison -v -d ael.y) + $(CMD_PREFIX) (cd ael; $(BISON) -v -d ael.y) dundi-parser.o: dundi-parser.h dundi-parser.o: _ASTCFLAGS+=-I. |