FLEX and YACC variables set after PGSQL/Makefile.global has been sourced

and only if not therein defined.

git-svn-id: http://svn.osgeo.org/postgis/trunk@1452 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/Makefile.config b/Makefile.config
index 0bf2b662df8f8c1b813ebbe2c57e684f2fbd5090..21c94edb687eb27bc5629fd457d233721841acb4 100644 (file)
--- a/Makefile.config
+++ b/Makefile.config
@@ -75,12 +75,6 @@ USE_ICONV ?= 0
 # LPATH=/usr/src/postgis
 LPATH ?= \$$libdir
 
-#
-# Path to flex, yacc
-#
-FLEX ?= flex
-YACC ?= yacc
-
 #---------------------------------------------------------------
 # END OF CONFIGURATION
 #---------------------------------------------------------------
@@ -89,6 +83,17 @@ subdir=contrib/postgis
 top_builddir = ${PGSQL_SRC}
 include $(top_builddir)/src/Makefile.global
 
+#
+# This needs to be defined after PGSQL Makefile.global
+# has been sources as it redefines FLEX
+#
+ifeq ($(strip $(FLEX)),)
+    FLEX = flex
+endif
+ifeq ($(strip $(YACC)),)
+    YACC = yacc
+endif
+
 #---------------------------------------------------------------
 # Test the version string and set the USE_VERSION macro
 # appropriately.