From: Marko Kreen <markokr@gmail.com>
Date: Wed, 1 Dec 2010 10:23:47 +0000 (+0200)
Subject: More portable workaround for empty FLEX/BISON
X-Git-Tag: plproxy_2_2_rc1~7
X-Git-Url: http://git.postgresql.org/gitweb/static/session/%7B%7Bsession.id%7D%7D-%7B%7Bsession.title%7Cslugify%7D%7D?a=commitdiff_plain;h=3215d6b4c80439d603de7cc3335f1b17e479468d;p=plproxy.git

More portable workaround for empty FLEX/BISON

The $(or ) does not work on older gnu makes, $(if )
is more portable.

Suggested by Peter Eisentraut
---

diff --git a/Makefile b/Makefile
index 48029b4..30583a6 100644
--- a/Makefile
+++ b/Makefile
@@ -59,8 +59,8 @@ SHLIB_LINK += -lws2_32 -lpgport
 endif
 
 # PGXS may define them as empty
-FLEX := $(or $(FLEX), flex)
-BISON := $(or $(BISON), bison)
+FLEX := $(if $(FLEX),$(FLEX),flex)
+BISON := $(if $(BISON),$(BISON),bison)
 
 # parser rules
 src/scanner.o: src/parser.tab.h