Err, and use the new menuselect define, too.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@242969 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/Makefile b/main/Makefile
index 71f898a6342f20aff5d9c78504b575df5540fb59..e588325c82176481e9520864d69daa52df2a5d64 100644 (file)
--- a/main/Makefile
+++ b/main/Makefile
@@ -95,7 +95,7 @@ editline/libedit.a:
 db1-ast/libdb1.a:
        _ASTCFLAGS="$(_ASTCFLAGS)" ASTCFLAGS="$(ASTCFLAGS) -Wno-strict-aliasing" $(MAKE) -C db1-ast libdb1.a
 
-ifneq ($(and $(findstring bison,$(BISON)),$(findstring flex,$(FLEX))),)
+ifneq ($(findstring REBUILD_PARSERS,$(MENUSELECT_CFLAGS)),)
 ast_expr2.c ast_expr2.h: ast_expr2.y
 else
 ast_expr2.c ast_expr2.h:
@@ -103,7 +103,7 @@ endif
        $(ECHO_PREFIX) echo "   [BISON] $< -> $@"
        $(CMD_PREFIX) $(BISON) -o $@ -d --name-prefix=ast_yy ast_expr2.y
 
-ifneq ($(and $(findstring bison,$(BISON)),$(findstring flex,$(FLEX))),)
+ifneq ($(findstring REBUILD_PARSERS,$(MENUSELECT_CFLAGS)),)
 ast_expr2f.c: ast_expr2.fl
 else
 ast_expr2f.c:

diff --git a/pbx/Makefile b/pbx/Makefile
index 27c44b189a700c79a7d8afc6ddd2275b7dccf861..be79b26bd5b1ffcb0c554c96d4626f30210209f6 100644 (file)
--- a/pbx/Makefile
+++ b/pbx/Makefile
@@ -44,7 +44,7 @@ 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 ($(and $(findstring bison,$(BISON)),$(findstring flex,$(FLEX))),)
+ifneq ($(findstring REBUILD_PARSERS,$(MENUSELECT_CFLAGS)),)
 ael/ael_lex.c: ael/ael.flex
 else
 ael/ael_lex.c:
@@ -53,7 +53,7 @@ endif
        $(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 ($(and $(findstring bison,$(BISON)),$(findstring flex,$(FLEX))),)
+ifneq ($(findstring REBUILD_PARSERS,$(MENUSELECT_CFLAGS)),)
 ael/ael.tab.c ael/ael.tab.h: ael/ael.y
 else
 ael/ael.tab.c ael/ael.tab.h: