Changeset 21805 for main/trunk/greenstone2

Timestamp:

2010-03-19T22:28:46+13:00 (14 years ago)

Author:

ak19

Message:

When the Perl 5.8.9 targz is downloaded for the Mac case, it is now also dealt with

File:

• main/trunk/greenstone2/setup.bash (modified) (2 diffs)

main/trunk/greenstone2/setup.bash

@@ -265 +265 @@
 # folder, then we set things up to use that, instead of a system perl 
 if [ -d "$GSDLHOME/bin/$GSDLOS/perl" ] ; then
+
     PATH=$GSDLHOME/bin/$GSDLOS/perl/bin:$PATH
     export PATH
-    LD_LIBRARY_PATH=$GSDLHOME/bin/$GSDLOS/perl/lib/5.8.9/i686-linux-thread-multi/CORE:$LD_LIBRARY_PATH
-    export LD_LIBRARY_PATH
+
+    if test "$GSDLOS" = "linux" ; then
+    LD_LIBRARY_PATH=$GSDLHOME/bin/$GSDLOS/perl/lib/5.8.9/i686-linux-thread-multi/CORE:$LD_LIBRARY_PATH
+    export LD_LIBRARY_PATH
+    elif test "$GSDLOS" = "darwin" ; then
+    DYLD_LIBRARY_PATH=$GSDLHOME/bin/$GSDLOS/perl/lib/5.8.9/darwin-thread-multi-2level/CORE:$DYLD_LIBRARY_PATH
+    export DYLD_LIBRARY_PATH
+    fi
+
     if [ "x$PERL5LIB" = "x" ] ; then
     PERL5LIB=$GSDLHOME/bin/$GSDLOS/perl/lib
@@ -275 +283 @@
     fi
     export PERL5LIB
+
     echo ""
     echo "***** Perl installation detected inside Greenstone."