From: Alan W. I. <ai...@us...> - 2006-12-19 18:49:35
|
Update of /cvsroot/plplot/plplot/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29047 Modified Files: test_perl.sh.in Log Message: Make sure correct version of libraries is picked up both in the build tree _and_ install tree. In the build tree, the build location of the library should always be used since that is first, but that location is meaningless in the install tree because it is relative so it falls back to the install location of the library. Index: test_perl.sh.in =================================================================== RCS file: /cvsroot/plplot/plplot/test/test_perl.sh.in,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- test_perl.sh.in 19 Dec 2006 17:17:06 -0000 1.7 +++ test_perl.sh.in 19 Dec 2006 18:49:28 -0000 1.8 @@ -30,12 +30,12 @@ # skip 17 because it is interactive. # skip 25 and 26 because they are not yet implemented. -# Ensure correct version of the libraries are picked up in the build -# tree. Has no impact in the install tree. +# Ensure correct version of the libraries are picked up in both the build +# tree and install tree. if [ "$LD_LIBRARY_PATH" == "" ] ; then - export LD_LIBRARY_PATH=../src + export LD_LIBRARY_PATH=../src:@LIB_DIR@ else - export LD_LIBRARY_PATH=../src:$LD_LIBRARY_PATH + export LD_LIBRARY_PATH=../src:@LIB_DIR@:$LD_LIBRARY_PATH fi for index in 01 02 03 04 05 06 07 08 09 10 11 12 13 15 16 18 19 20 21 22 23 24; do |