Skip to content

Commit 6750a00

Browse files
vbwagnervbwagner
committed
Merge branch 'PGPROEE9_6' into PGPROEE9_6_MULTIMASTER
2 parents e826954 + 7179eb4 commit 6750a00

File tree

531 files changed

+47105
-26230
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

531 files changed

+47105
-26230
lines changed

‎.ci/build_and_test_world

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
#!/bin/sh
2-
2+
if [ -z "$TCLCONFIG" ]; then
3+
[ -x /usr/lib/tcl8.5/tclConfig.sh ] && TCLCONFIG=/usr/lib/tcl8.5
4+
[ -x /usr/lib/tcl8.6/tclConfig.sh ] && TCLCONFIG=/usr/lib/tcl8.6
5+
fi
6+
[ -n "$TCLCONFIG" ] && export TCLCONFIG
7+
echo TCLCONFIG=${TCLCONFIG}
38
#
49
# script which exececutes all the build stages. If script executed with
510
# no arguments and something fails, every bit of logs, stack traces and

‎GNUmakefile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ $(distdir).tar: distdir
9595
distdir-location:
9696
@echo $(distdir)
9797

98-
distdir:
98+
distdir: src/include/commit_id.h
9999
rm -rf $(distdir)* $(dummy)
100100
for x in `cd $(top_srcdir) && find . \( -name CVS -prune \) -o \( -name .git -prune \) -o -print`; do \
101101
file=`expr X$$x : 'X\./\(.*\)'`; \

0 commit comments

Comments
 (0)