From: Alan W. I. <ai...@us...> - 2006-12-02 21:56:07
|
Update of /cvsroot/plplot/plplot/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30777/test Modified Files: plplot-test.sh.cmake Log Message: Dispense with the unconfigured DIRNAME stuff. Index: plplot-test.sh.cmake =================================================================== RCS file: /cvsroot/plplot/plplot/test/plplot-test.sh.cmake,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- plplot-test.sh.cmake 2 Dec 2006 20:51:00 -0000 1.8 +++ plplot-test.sh.cmake 2 Dec 2006 21:56:06 -0000 1.9 @@ -34,8 +34,6 @@ version=@VERSION@ -dirname=@DIRNAME@ - EXAMPLES_DIR=${EXAMPLES_DIR:-.} SRC_EXAMPLES_DIR=${SRC_EXAMPLES_DIR:-.} OUTPUT_DIR=${OUTPUT_DIR:-.} @@ -228,17 +226,13 @@ test "@ENABLE_pdl@" = ON && FRONT_END="$FRONT_END perl" fi -# Find where the front-end scripts are by looking at the dirname of the -# current script. Try to use first the dirname program found by configure. -# Otherwise, fall back to a sed solution (this fails on Mac OS X!). -if test -n "$dirname" ; then - scripts_dir=`$dirname $0` +# Find where the front-end scripts are by looking at the directory name of the +# current script. + +if test "@WIN32@" = "1"; then + scripts_dir=${0%/*} else - if test "@WIN32@" = "1"; then - scripts_dir=${0%/*} - else - scripts_dir=`echo $0 | sed 's:/[^/][^/]*$::'` - fi + scripts_dir=`echo $0 | sed 's:/[^/][^/]*$::'` fi # Call the front-end scripts |