Show
Ignore:
Timestamp:
28.01.2011 14:50:24 (9 years ago)
Author:
ak19
Message:

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

Files:
1 modified

Legend:

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

    r23634 r23646  
    11#!/bin/bash 
    2  
    3 if test -e apache-httpd ; 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 
    8       DYLD_LIBRARY_PATH="$GSDLHOME/apache-httpd/$GSDLOS/lib:$DYLD_LIBRARY_PATH" 
    9       export DYLD_LIBRARY_PATH 
    10   fi 
    11 fi 
    12  
    132 
    143if [ -z "$serverlang" ]; then 
     
    7564fi 
    7665 
     66# On MAC, need to tell apache to find and use its own libiconv(?).dylib 
     67if test -e apache-httpd ; then 
     68  if test "$GSDLOS" = "darwin" ; then       
     69      echo "+Adding in executable path for apache-httpd" 
     70      PATH=$GSDLHOME/apache-httpd/$GSDLOS/bin:$PATH 
     71      export PATH 
     72      DYLD_LIBRARY_PATH="$GSDLHOME/apache-httpd/$GSDLOS/lib:$DYLD_LIBRARY_PATH" 
     73      export DYLD_LIBRARY_PATH 
     74  fi 
     75fi 
    7776 
    7877# First test that there is actually something that can be run...