diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-25 05:46:46 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-25 05:46:46 +0000 |
| commit | 388bd3f44dee8bced500158ce4ef39d717371432 (patch) | |
| tree | 77031a12c258f3a2a436714028f6073b7ab2aa2b | |
| parent | b311baf2be87e6165b63ad49baa8a05362c61ea1 (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.1@242731 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | main/Makefile | 8 | ||||
| -rw-r--r-- | res/Makefile | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/main/Makefile b/main/Makefile index 4990fcff2..c83edd63a 100644 --- a/main/Makefile +++ b/main/Makefile @@ -110,21 +110,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 >> $@ diff --git a/res/Makefile b/res/Makefile index 4ca0233de..77730758e 100644 --- a/res/Makefile +++ b/res/Makefile @@ -43,22 +43,22 @@ $(if $(filter res_snmp,$(EMBEDDED_MODS)),modules.link,res_snmp.so): snmp/agent.o $(if $(filter res_ael_share,$(EMBEDDED_MODS)),modules.link,res_ael_share.so): ael/ael_lex.o ael/ael.tab.o ael/pval.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 -e "/begin standard C headers/i#include \"asterisk.h\"" ael_lex.c > zz; mv zz ael_lex.c) + $(CMD_PREFIX) (cd ael; $(FLEX) ael.flex; sed -e "/begin standard C headers/i#include \"asterisk.h\"" ael_lex.c > zz; mv zz 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) ael/pval.o: ael/pval.c |