Changeset 23646 for main/trunk/greenstone2

Timestamp:

2011-01-28T14:50:24+13:00 (13 years ago)

Author:

ak19

Message:

Fixing oversight: The recent changes need to be moved after the section sourcing setup.bash.

File:

• main/trunk/greenstone2/gs2-server.sh (modified) (2 diffs)

main/trunk/greenstone2/gs2-server.sh

@@ -1 +1 @@
 #!/bin/bash
-
-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
-fi
-
 
 if [ -z "$serverlang" ]; then
@@ -75 +64 @@
 fi
 
+# 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
+fi
 
 # First test that there is actually something that can be run...