Show
Ignore:
Timestamp:
02.02.2011 20:29:43 (9 years ago)
Author:
ak19
Message:

Moved Sam's suggested changes committed with Revision 23660 into gsicontrol.sh so that they are always in effect when the apache web server is run (even if run directly from gsicontrol.sh).

Files:
1 modified

Legend:

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

    r23660 r23663  
    6262  source ./setup.bash 
    6363  popd > /dev/null 
    64 fi 
    65  
    66 # On MAC, need to tell apache to find and use its own libiconv<num>.dylib 
    67 # If gs2-server.sh is run from GLI, we can't just test for the existence 
    68 # of "apache-httpd", so use the full path (from GSDLHOME) to test it exists 
    69 if test -e "$GSDLHOME/apache-httpd" ; then 
    70     echo "+Adding in executable path for apache-httpd" 
    71     PATH=$GSDLHOME/apache-httpd/$GSDLOS/bin:$PATH 
    72     export PATH 
    73      
    74     if test "$GSDLOS" = "linux" ; then 
    75     LD_LIBRARY_PATH="$GSDLHOME/apache-httpd/$GSDLOS/lib:$LD_LIBRARY_PATH" 
    76     export LD_LIBRARY_PATH 
    77     elif test "$GSDLOS" = "darwin" ; then       
    78     DYLD_LIBRARY_PATH="$GSDLHOME/apache-httpd/$GSDLOS/lib:$DYLD_LIBRARY_PATH" 
    79     export DYLD_LIBRARY_PATH 
    80     fi 
    8164fi 
    8265