Commit7d3b7db

committed

Set DYLD_LIBRARY_PATH so that 'make check' works without prior

'make install' on OS X. Per suggestion from Adam Witney.

1 parenta2ec3fe commit7d3b7dbCopy full SHA for 7d3b7db

File tree

+11

-3

lines changed

+11

-3

lines changed

Lines changed: 11 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`#! /bin/sh`
`2`		`-# $PostgreSQL: pgsql/src/test/regress/pg_regress.sh,v 1.45 2004/06/03 00:25:47 momjian Exp $`
	`2`	`+# $PostgreSQL: pgsql/src/test/regress/pg_regress.sh,v 1.46 2004/08/10 22:24:06 tgl Exp $`
`3`	`3`
`4`	`4`	me=`basename$0`
`5`	`5`	`:${TMPDIR=/tmp}`
`@@ -328,8 +328,9 @@ then`
`328`	`328`
`329`	`329`	`# ----------`
`330`	`330`	`# Set up shared library paths, needed by psql and pg_encoding`
`331`		`-# (if you run multibyte). LD_LIBRARY_PATH covers many platforms,`
`332`		`-# feel free to account for others as well.`
	`331`	`+# (if you run multibyte). LD_LIBRARY_PATH covers many platforms.`
	`332`	`+# DYLD_LIBRARY_PATH works on Darwin, and maybe other Mach-based systems.`
	`333`	`+# Feel free to account for others as well.`
`333`	`334`	`# ----------`
`334`	`335`
`335`	`336`	`if [-n"$LD_LIBRARY_PATH" ];then`
`@@ -339,6 +340,13 @@ then`
`339`	`340`	`fi`
`340`	`341`	`export LD_LIBRARY_PATH`
`341`	`342`
	`343`	`+if [-n"$DYLD_LIBRARY_PATH" ];then`
	`344`	`+ DYLD_LIBRARY_PATH="$libdir:$DYLD_LIBRARY_PATH"`
	`345`	`+else`
	`346`	`+ DYLD_LIBRARY_PATH=$libdir`
	`347`	`+fi`
	`348`	`+export DYLD_LIBRARY_PATH`
	`349`	`+`
`342`	`350`	`# ----------`
`343`	`351`	`# Windows needs shared libraries in PATH. (Only those linked into`
`344`	`352`	`# executables, not dlopen'ed ones)`

Comments

(0)