Changeset 23634

Show
Ignore:
Timestamp:
25.01.2011 16:37:54 (9 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:
2 modified

Legend:

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

    r23620 r23634  
    22 
    33if test -e apache-httpd ; then 
    4   echo "+Adding in executable path for apache-httpd" 
    5   PATH=$GSDLHOME/apache-httpd/$GSDLOS/bin:$PATH 
    6   export PATH 
    7  
    8   if test "$GSDLOS" = "linux" ; then 
    9       LD_LIBRARY_PATH="$GSDLHOME/apache-httpd/$GSDLOS/lib:$LD_LIBRARY_PATH" 
    10       export LD_LIBRARY_PATH 
    11  
    12   elif test "$GSDLOS" = "darwin" ; then 
     4  if test "$GSDLOS" = "darwin" ; then       
     5      echo "+Adding in executable path for apache-httpd" 
     6      PATH=$GSDLHOME/apache-httpd/$GSDLOS/bin:$PATH 
     7      export PATH 
    138      DYLD_LIBRARY_PATH="$GSDLHOME/apache-httpd/$GSDLOS/lib:$DYLD_LIBRARY_PATH" 
    149      export DYLD_LIBRARY_PATH 
  • main/trunk/greenstone2/setup.bash

    r23620 r23634  
    240240fi 
    241241 
     242if test -e apache-httpd ; then 
     243  if test "$GSDLOS" = "linux" ; then 
     244      echo "+Adding in executable path for apache-httpd" 
     245      PATH=$GSDLHOME/apache-httpd/$GSDLOS/bin:$PATH 
     246      export PATH 
     247      LD_LIBRARY_PATH="$GSDLHOME/apache-httpd/$GSDLOS/lib:$LD_LIBRARY_PATH" 
     248      export LD_LIBRARY_PATH 
     249  fi 
     250fi 
    242251 
    243252if test -e local ; then