summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Eisentraut <peter_e@gmx.net>2012-03-30 20:36:49 +0300
committerPeter Eisentraut <peter_e@gmx.net>2012-03-30 20:36:49 +0300
commit6ca365bff28e52dc14500df84e7b3230d4c292eb (patch)
treef4500f412b486db7923e612d201d3613d27ef9b4
parent3f427c1353d92c41069197b31ea6c8b89f24cd11 (diff)
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.
-rw-r--r--src/makefiles/pgxs.mk10
1 files changed, 10 insertions, 0 deletions
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