Merge branch 'PGPROEE9_6' into PGPROEE9_6_MULTIMASTER

Author: vbwagner

.ci/build_and_test_world

@@ -1,5 +1,10 @@
 #!/bin/sh
-
+if [ -z "$TCLCONFIG" ]; then
+[ -x /usr/lib/tcl8.5/tclConfig.sh ] && TCLCONFIG=/usr/lib/tcl8.5
+[ -x /usr/lib/tcl8.6/tclConfig.sh ] && TCLCONFIG=/usr/lib/tcl8.6
+fi
+[ -n "$TCLCONFIG" ] && export TCLCONFIG
+echo TCLCONFIG=${TCLCONFIG}
 #
 # script which exececutes all the build stages. If script executed with
 # no arguments and something fails, every bit of logs, stack traces and

GNUmakefile.in

@@ -95,7 +95,7 @@ $(distdir).tar: distdir
 distdir-location:
 	@echo $(distdir)
 
-distdir:
+distdir: src/include/commit_id.h
 	rm -rf $(distdir)* $(dummy)
 	for x in `cd $(top_srcdir) && find . \( -name CVS -prune \) -o \( -name .git -prune \) -o -print`; do \
 	  file=`expr X$$x : 'X\./\(.*\)'`; \