Changeset 24335

Show
Ignore:
Timestamp:
26.07.2011 10:58:25 (8 years ago)
Author:
davidb
Message:

Matching test for gs3-setup.sh with setup.bash when checking for extensions

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/gs3-setup.sh

    r23894 r24335  
    269269fi 
    270270 
     271 
    271272if test "x$gsopt_noexts" != "x1" ; then 
    272273    if test -e ext ; then 
     
    274275        if [ -d $gsdl_ext ] ; then  
    275276        cd $gsdl_ext > /dev/null 
    276         if test -e setup.bash ; then  
     277        if test -e gs3-setup.sh ; then  
     278            source ./gs3-setup.sh  
     279        elif test -e setup.bash ; then  
    277280            source ./setup.bash  
    278281        fi  
     
    289292    cd local ; source gs3-setup.sh ; cd .. 
    290293  fi 
    291  
    292   # Consider moving these into the local/gs3-setup.sh file 
    293  
    294   PATH=$GSDL3SRCHOME/local/bin:$PATH 
    295   export PATH 
    296   LD_LIBRARY_PATH=$GSDL3SRCHOME/local/lib:$LD_LIBRARY_PATH 
    297   export LD_LIBRARY_PATH 
    298   DYLD_LIBRARY_PATH=$GSDL3SRCHOME/local/lib:$DYLD_LIBRARY_PATH 
    299   export DYLD_LIBRARY_PATH 
    300294fi 
    301295