Changeset 24335 for main

Timestamp:

2011-07-26T10:58:25+12:00 (13 years ago)

Author:

davidb

Message:

Matching test for gs3-setup.sh with setup.bash when checking for extensions

File:

• main/trunk/greenstone3/gs3-setup.sh (modified) (3 diffs)

main/trunk/greenstone3/gs3-setup.sh

@@ -269 +269 @@
 fi
 
+
 if test "x$gsopt_noexts" != "x1" ; then
     if test -e ext ; then
@@ -274 +275 @@
         if [ -d $gsdl_ext ] ; then 
         cd $gsdl_ext > /dev/null
-        if test -e setup.bash ; then 
+        if test -e gs3-setup.sh ; then 
+            source ./gs3-setup.sh 
+        elif test -e setup.bash ; then 
             source ./setup.bash 
         fi 
@@ -289 +292 @@
     cd local ; source gs3-setup.sh ; cd ..
   fi
-
-  # Consider moving these into the local/gs3-setup.sh file
-
-  PATH=$GSDL3SRCHOME/local/bin:$PATH
-  export PATH
-  LD_LIBRARY_PATH=$GSDL3SRCHOME/local/lib:$LD_LIBRARY_PATH
-  export LD_LIBRARY_PATH
-  DYLD_LIBRARY_PATH=$GSDL3SRCHOME/local/lib:$DYLD_LIBRARY_PATH
-  export DYLD_LIBRARY_PATH
 fi