diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-25 05:45:00 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-25 05:45:00 +0000 |
| commit | dbf9257276656ab5737eedf014a9784d9d4f8742 (patch) | |
| tree | bbc40232f1f9c72bcceb5f5a87350c5e1cc9245c /res/Makefile | |
| parent | b7b70b913ed3caaeb52409c208132e13c2e3ec9f (diff) | |
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/trunk@242729 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res/Makefile')
| -rw-r--r-- | res/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/res/Makefile b/res/Makefile index 1badb79e1..b842dec78 100644 --- a/res/Makefile +++ b/res/Makefile @@ -45,22 +45,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 |