Show
Ignore:
Timestamp:
30.01.2011 16:29:40 (9 years ago)
Author:
ak19
Message:

Related to the changes to gs2-server.sh committed for Mac: for Linux, am also adding in the apache-lib to LD_LIBRARY_PATH in gs2-server rather than setup.bash. Reinstating these recent changes for Linux, but in the correct location this time to correct a previous oversight: only makes sense to refer to GSDLHOME after the gs2-server.sh script has sourced setup.bash.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/gs2-server.sh

    r23646 r23648  
    6666# On MAC, need to tell apache to find and use its own libiconv(?).dylib 
    6767if test -e apache-httpd ; then 
    68   if test "$GSDLOS" = "darwin" ; then       
    69       echo "+Adding in executable path for apache-httpd" 
    70       PATH=$GSDLHOME/apache-httpd/$GSDLOS/bin:$PATH 
    71       export PATH 
    72       DYLD_LIBRARY_PATH="$GSDLHOME/apache-httpd/$GSDLOS/lib:$DYLD_LIBRARY_PATH" 
    73       export DYLD_LIBRARY_PATH 
    74   fi 
     68    echo "+Adding in executable path for apache-httpd" 
     69    PATH=$GSDLHOME/apache-httpd/$GSDLOS/bin:$PATH 
     70    export PATH 
     71     
     72    if test "$GSDLOS" = "linux" ; then 
     73    LD_LIBRARY_PATH="$GSDLHOME/apache-httpd/$GSDLOS/lib:$LD_LIBRARY_PATH" 
     74    export LD_LIBRARY_PATH 
     75    elif test "$GSDLOS" = "darwin" ; then       
     76    DYLD_LIBRARY_PATH="$GSDLHOME/apache-httpd/$GSDLOS/lib:$DYLD_LIBRARY_PATH" 
     77    export DYLD_LIBRARY_PATH 
     78    fi 
    7579fi 
    7680