Changeset 21805

Show
Ignore:
Timestamp:
19.03.2010 22:28:46 (10 years ago)
Author:
ak19
Message:

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

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/setup.bash

    r21603 r21805  
    265265# folder, then we set things up to use that, instead of a system perl  
    266266if [ -d "$GSDLHOME/bin/$GSDLOS/perl" ] ; then 
     267 
    267268    PATH=$GSDLHOME/bin/$GSDLOS/perl/bin:$PATH 
    268269    export PATH 
    269     LD_LIBRARY_PATH=$GSDLHOME/bin/$GSDLOS/perl/lib/5.8.9/i686-linux-thread-multi/CORE:$LD_LIBRARY_PATH 
    270     export LD_LIBRARY_PATH 
     270 
     271    if test "$GSDLOS" = "linux" ; then 
     272    LD_LIBRARY_PATH=$GSDLHOME/bin/$GSDLOS/perl/lib/5.8.9/i686-linux-thread-multi/CORE:$LD_LIBRARY_PATH 
     273    export LD_LIBRARY_PATH 
     274    elif test "$GSDLOS" = "darwin" ; then 
     275    DYLD_LIBRARY_PATH=$GSDLHOME/bin/$GSDLOS/perl/lib/5.8.9/darwin-thread-multi-2level/CORE:$DYLD_LIBRARY_PATH 
     276    export DYLD_LIBRARY_PATH 
     277    fi 
     278 
    271279    if [ "x$PERL5LIB" = "x" ] ; then 
    272280    PERL5LIB=$GSDLHOME/bin/$GSDLOS/perl/lib 
     
    275283    fi 
    276284    export PERL5LIB 
     285 
    277286    echo "" 
    278287    echo "***** Perl installation detected inside Greenstone."