From: Peter Eisentraut <peter_e@gmx.net>
Date: Fri, 30 Mar 2012 17:36:49 +0000 (+0300)
Subject: pgxs: Supply default values for BISON and FLEX variables
X-Git-Tag: REL9_2_BETA1~205
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6ca365bff28e52dc14500df84e7b3230d4c292eb;p=thirdparty%2Fpostgresql.git

pgxs: Supply default values for BISON and FLEX variables

Otherwise, the availability of these variables depends on what
happened to be available at the time the PostgreSQL build was
configured.
---

diff --git a/src/makefiles/pgxs.mk b/src/makefiles/pgxs.mk
index 7dc874240ac..318d5ef3070 100644
--- a/src/makefiles/pgxs.mk
+++ b/src/makefiles/pgxs.mk
@@ -64,6 +64,16 @@ include $(top_builddir)/src/Makefile.global
 top_srcdir = $(top_builddir)
 srcdir = .
 VPATH =
+
+# These might be set in Makefile.global, but if they were not found
+# during the build of PostgreSQL, supply default values so that users
+# of pgxs can use the variables.
+ifeq ($(BISON),)
+BISON = bison
+endif
+ifeq ($(FLEX),)
+FLEX = flex
+endif
 endif