Commitb30274d

committed

Merge branch 'PGPROEE9_6' into PGPROEE9_6_atx

2 parentsff7ad40 +931d24a commitb30274dCopy full SHA for b30274d

File tree

+1403

-753

lines changed

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

+1403

-753

lines changed

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,10 @@`
`1`	`1`	`#!/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}`
`3`	`8`	`#`
`4`	`9`	`# script which exececutes all the build stages. If script executed with`
`5`	`10`	`# no arguments and something fails, every bit of logs, stack traces and`

Lines changed: 1 addition & 1 deletion

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

Comments

(0)