Changeset 23648 for main/trunk/greenstone2

Timestamp:

2011-01-30T16:29:40+13:00 (13 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.

Location:

main/trunk/greenstone2

Files:

• gs2-server.sh (modified) (1 diff)
• setup.bash (modified) (1 diff)

main/trunk/greenstone2/gs2-server.sh

@@ -66 +66 @@
 # On MAC, need to tell apache to find and use its own libiconv(?).dylib
 if test -e apache-httpd ; then
-  if test "$GSDLOS" = "darwin" ; then      
-      echo "+Adding in executable path for apache-httpd"
-      PATH=$GSDLHOME/apache-httpd/$GSDLOS/bin:$PATH
-      export PATH
-      DYLD_LIBRARY_PATH="$GSDLHOME/apache-httpd/$GSDLOS/lib:$DYLD_LIBRARY_PATH"
-      export DYLD_LIBRARY_PATH
-  fi
+    echo "+Adding in executable path for apache-httpd"
+    PATH=$GSDLHOME/apache-httpd/$GSDLOS/bin:$PATH
+    export PATH
+    
+    if test "$GSDLOS" = "linux" ; then
+    LD_LIBRARY_PATH="$GSDLHOME/apache-httpd/$GSDLOS/lib:$LD_LIBRARY_PATH"
+    export LD_LIBRARY_PATH
+    elif test "$GSDLOS" = "darwin" ; then      
+    DYLD_LIBRARY_PATH="$GSDLHOME/apache-httpd/$GSDLOS/lib:$DYLD_LIBRARY_PATH"
+    export DYLD_LIBRARY_PATH
+    fi
 fi
 

main/trunk/greenstone2/setup.bash

@@ -240 +240 @@
 fi
 
-if test -e apache-httpd ; then
-  if test "$GSDLOS" = "linux" ; then
-      echo "+Adding in executable path for apache-httpd"
-      PATH=$GSDLHOME/apache-httpd/$GSDLOS/bin:$PATH
-      export PATH
-      LD_LIBRARY_PATH="$GSDLHOME/apache-httpd/$GSDLOS/lib:$LD_LIBRARY_PATH"
-      export LD_LIBRARY_PATH
-  fi
-fi
-
 if test -e local ; then
   if test -e local/setup.bash ; then