Merge remote-tracking branch 'upstream/BABEL_5_X_DEV' into xmlnamespaces-5x

Author: Japleen Kaur

.gitignore

@@ -44,6 +44,7 @@ contrib/babelfishpg_tsql/src/fts_scan.c
 contrib/babelfishpg_tsql/src/pl_gram.c
 contrib/babelfishpg_tsql/src/pl_gram.h
 contrib/babelfishpg_tsql/src/pl_gram.output
+contrib/babelfishpg_tsql/src/plerrcodes.h
 
 # PLtsql nodes serialization - auto-generated by gen_pltsql_node_support.pl
 contrib/babelfishpg_tsql/src/pltsql_node/pltsql_nodetags.h

contrib/babelfishpg_common/Makefile

@@ -95,6 +95,10 @@ GE91		 = $(call test, $(MAJORVER), -ge, 91)
 
 PGXS := $(shell $(PG_CONFIG) --pgxs)
 
+# Generated files to remove on 'make clean' so they are always
+# regenerated with the current tool versions (flex, bison, perl).
+EXTRA_CLEAN += src/geo_scan.c src/geo_parser.c
+
 src/geo_parser.o: src/geo_scan.c src/geo_data.h
 src/geo.o: src/geo_scan.c src/geo_parser.c src/geo_data.h
 distprep: src/geo_scan.c src/geo_parser.c