From 0495d4e0721b39737eee83b73e8185f7602e0f1f Mon Sep 17 00:00:00 2001 From: Peter Verthez Date: Wed, 23 Oct 2002 16:57:07 +0000 Subject: [PATCH] Portability fixes. --- t/anselconv.test | 6 ++++-- t/path1.test | 3 ++- t/path2.test | 6 ++++-- t/src/test_gom | 3 ++- t/src/test_script | 3 ++- t/src/test_update | 3 ++- 6 files changed, 16 insertions(+), 8 deletions(-) diff --git a/t/anselconv.test b/t/anselconv.test index 59cae59..2eb0495 100755 --- a/t/anselconv.test +++ b/t/anselconv.test @@ -7,7 +7,8 @@ then fi builddir=`pwd` -export GCONV_PATH=.:$GCONV_PATH +GCONV_PATH=.:$GCONV_PATH +export GCONV_PATH ln -s $srcdir/../data/gedcom.enc . ln -s $builddir/../iconv/glibc/.libs/ANSI_Z39.47.so . ln -s $srcdir/../iconv/glibc/gconv-modules . @@ -16,7 +17,8 @@ retval=0 if [ "$ICONV_PATH" ] then - export PATH=$ICONV_PATH:$PATH + PATH=$ICONV_PATH:$PATH + export PATH fi echo "Testing conversion from ANSEL to UTF-8" >> testgedcom.out diff --git a/t/path1.test b/t/path1.test index f45db0a..16459a4 100755 --- a/t/path1.test +++ b/t/path1.test @@ -1,6 +1,7 @@ #!/bin/sh builddir=`pwd` -export LD_LIBRARY_PATH=$builddir/../gedcom/.libs:$LD_LIBRARY_PATH +LD_LIBRARY_PATH=$builddir/../gedcom/.libs:$LD_LIBRARY_PATH +export LD_LIBRARY_PATH unset GCONV_PATH $builddir/src/pathtest diff --git a/t/path2.test b/t/path2.test index 1f9fd23..167e769 100755 --- a/t/path2.test +++ b/t/path2.test @@ -1,6 +1,8 @@ #!/bin/sh builddir=`pwd` -export LD_LIBRARY_PATH=$builddir/../gedcom/.libs:$LD_LIBRARY_PATH -export GCONV_PATH=./ansel +LD_LIBRARY_PATH=$builddir/../gedcom/.libs:$LD_LIBRARY_PATH +export LD_LIBRARY_PATH +GCONV_PATH=./ansel +export GCONV_PATH $builddir/src/pathtest diff --git a/t/src/test_gom b/t/src/test_gom index b3a9f73..0dbcd62 100755 --- a/t/src/test_gom +++ b/t/src/test_gom @@ -36,7 +36,8 @@ fi builddir=`pwd` ltcmd="$builddir/../libtool --mode=execute -dlopen $builddir/../gedcom/libgedcom.la -dlopen $builddir/../gom/libgedcom_gom.la" -export GCONV_PATH=.:$GCONV_PATH +GCONV_PATH=.:$GCONV_PATH +export GCONV_PATH ln -s $srcdir/../data/gedcom.enc . ln -s $builddir/../iconv/glibc/.libs/ANSI_Z39.47.so . ln -s $srcdir/../iconv/glibc/gconv-modules . diff --git a/t/src/test_script b/t/src/test_script index 0061ce5..ebcda7b 100755 --- a/t/src/test_script +++ b/t/src/test_script @@ -34,7 +34,8 @@ fi builddir=`pwd` ltcmd="$builddir/../libtool --mode=execute -dlopen $builddir/../gedcom/libgedcom.la" -export GCONV_PATH=.:$GCONV_PATH +GCONV_PATH=.:$GCONV_PATH +export GCONV_PATH ln -s $srcdir/../data/gedcom.enc . ln -s $builddir/../iconv/glibc/.libs/ANSI_Z39.47.so . ln -s $srcdir/../iconv/glibc/gconv-modules . diff --git a/t/src/test_update b/t/src/test_update index 78e3c39..cbe0c33 100755 --- a/t/src/test_update +++ b/t/src/test_update @@ -31,7 +31,8 @@ fi builddir=`pwd` ltcmd="$builddir/../libtool --mode=execute -dlopen $builddir/../gedcom/libgedcom.la" -export GCONV_PATH=.:$GCONV_PATH +GCONV_PATH=.:$GCONV_PATH +export GCONV_PATH ln -s $srcdir/../data/gedcom.enc . ln -s $builddir/../data/new.ged . ln -s $builddir/../iconv/glibc/.libs/ANSI_Z39.47.so . -- 2.30.2