X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=jpl%2Finstall-jpl;h=f19e226e488b3e969f5a0d360388c6259887ef11;hb=e77e2f143f073d08d6764e30771960b2bccde0db;hp=c1ef0b4e128421c7842e76bd760770d9af171406;hpb=5cf1d1f16c1401220ecaa7b3127343c7c6c095d2;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/jpl/install-jpl b/jpl/install-jpl
index c1ef0b4..f19e226 100755
--- a/jpl/install-jpl
+++ b/jpl/install-jpl
@@ -116,9 +116,9 @@ print "\nInstalling JNI module\n";
 system <<'END' and die "Couldn't install JNI\n";
 set -x
 cd JNI
-perl Makefile.PL
+perl Makefile.PL -e
 make clean
-perl Makefile.PL
+perl Makefile.PL -e
 make
 echo 'Attempting to install JNI as root'
 su root -c "make install"
@@ -187,14 +187,8 @@ archname=`$JPLPERL -MConfig -e 'print $Config{archname}'`
 CLASSPATH=".:$JPL_HOME/lib${CLASSPATH:+:$CLASSPATH}"
 export CLASSPATH
 
-ldlibpthname=`$JPLPERL -MConfig -e 'print $Config{ldlibpthname}'`
-case "$ldlibpthname" in
-'') ldlibpthname=LD_LIBRARY_PATH ;;
-esac
-eval "ldlibpth=\$$ldlibpthname"
-
-$ldlibpthname=".:$JPL_HOME/lib/$archname:$archlib/CORE$ldlibpth"
-export $ldlibpthname
+LD_LIBRARY_PATH=".:$JPL_HOME/lib/$archname:$archlib/CORE${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
+export LD_LIBRARY_PATH
 
 PERL5LIB="$JPL_HOME/perl${PERL5LIB:+:$PERL5LIB}"
 export PERL5LIB
@@ -211,13 +205,13 @@ case "$1" in
 \$ENV{JPL_HOME} = '$JPL_HOME';
 \$ENV{JPLPERL} = '$JPLPERL';
 \$ENV{CLASSPATH} = '$CLASSPATH';
-\$ENV{$ldlibpthname} = '$ldlibpth';
+\$ENV{LD_LIBRARY_PATH} = '$LD_LIBRARY_PATH';
 \$ENV{PERL5LIB} = '$PERL5LIB';
 END
     ;;
 -sh)
     cat <<END
- PATH='$PATH';export PATH;JAVA_HOME='$JAVA_HOME';export JAVA_HOME;JPL_HOME='$JPL_HOME';export JPL_HOME;JPLPERL='$JPLPERL';export JPLPERL;CLASSPATH='$CLASSPATH';export CLASSPATH;$ldlibpthname='$ldlibpth';export $ldlibpthname;PERL5LIB='$PERL5LIB';export PERL5LIB
+ PATH='$PATH';export PATH;JAVA_HOME='$JAVA_HOME';export JAVA_HOME;JPL_HOME='$JPL_HOME';export JPL_HOME;JPLPERL='$JPLPERL';export JPLPERL;CLASSPATH='$CLASSPATH';export CLASSPATH;LD_LIBRARY_PATH='$LD_LIBRARY_PATH';export LD_LIBRARY_PATH;PERL5LIB='$PERL5LIB';export PERL5LIB
 END
     ;;
 -csh)
@@ -227,7 +221,7 @@ setenv JAVA_HOME '$JAVA_HOME';
 setenv JPL_HOME '$JPL_HOME';
 setenv JPLPERL '$JPLPERL';
 setenv CLASSPATH '$CLASSPATH';
-setenv $ldlibpthname '$ldlibpth';
+setenv LD_LIBRARY_PATH '$LD_LIBRARY_PATH';
 setenv PERL5LIB '$PERL5LIB';
 END
     ;;