[asterisk-commits] tilghman: branch 1.4 r242728 - in /branches/1.4: main/Makefile pbx/Makefile

[SVN commits to the Asterisk project]

Author: tilghman
Date: Sun Jan 24 23:42:22 2010
New Revision: 242728

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=242728
Log:
Buildbot pointed out an error (thanks, buildbot!)

Modified:
    branches/1.4/main/Makefile
    branches/1.4/pbx/Makefile

Modified: branches/1.4/main/Makefile
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/main/Makefile?view=diff&rev=242728&r1=242727&r2=242728
==============================================================================
--- branches/1.4/main/Makefile (original)
+++ branches/1.4/main/Makefile Sun Jan 24 23:42:22 2010
@@ -95,21 +95,21 @@
 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
 

Modified: branches/1.4/pbx/Makefile
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/pbx/Makefile?view=diff&rev=242728&r1=242727&r2=242728
==============================================================================
--- branches/1.4/pbx/Makefile (original)
+++ branches/1.4/pbx/Makefile Sun Jan 24 23:42:22 2010
@@ -44,22 +44,22 @@
 
 $(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.