Changeset 23634 for main/trunk

Timestamp:

2011-01-25T16:37:54+13:00 (13 years ago)

Author:

ak19

Message:

Adjusting the commits made for revision 23620 so that Linux is not affected. The changes which were committed to gs2-server.sh and setup.bash for Mac, so that only gs2-server would set its DYLD_LIBRARY_PATH to the libiconv.lib generated in the apache folder, broke the web-start on Linux. That change should only be done for Mac.

Location:

main/trunk/greenstone2

Files:

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

main/trunk/greenstone2/gs2-server.sh

@@ -2 +2 @@
 
 if test -e apache-httpd ; then
-  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
+  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

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