Changeset 23660

Show
Ignore:
Timestamp:
02.02.2011 15:22:45 (9 years ago)
Author:
ak19
Message:

Sherlock Sam solved the mysterious problem of why the Mac binary's gs2-server.sh was working but not when the apache server was launched through GLI and whey both worked for the source distribution. The reason was that GLI runs gs2-server from the GLI folder, so a mere test for the existence of an apache-httpd dir will fail when done from the GLI fplder, unless prefixed with the full path to it.

Files:
1 modified

Legend:

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

    r23648 r23660  
    6464fi 
    6565 
    66 # On MAC, need to tell apache to find and use its own libiconv(?).dylib 
    67 if test -e apache-httpd ; then 
     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 
     69if test -e "$GSDLHOME/apache-httpd" ; then 
    6870    echo "+Adding in executable path for apache-httpd" 
    6971    PATH=$GSDLHOME/apache-httpd/$GSDLOS/bin:$PATH