Changeset 24610

Show
Ignore:
Timestamp:
19.09.2011 15:44:26 (8 years ago)
Author:
ak19
Message:

Part of commit 24600: setup.bash no longer sets imagemagick env vars. These are set in the new bin\script\gs-magick.pl script.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/setup.bash

    r24363 r24610  
    214214  # Override Imagemagick and Ghostscript paths to the bundled applications shipped with greenstone if they exists otherwise use default environment variables. 
    215215 
    216 if test -d "$GSDLHOME/bin/$GSDLOS$GSDLARCH/imagemagick" ; then 
    217     PATH="$GSDLHOME/bin/$GSDLOS$GSDLARCH/imagemagick/bin:$PATH" 
    218     export PATH 
    219    
    220     MAGICK_HOME="$GSDLHOME/bin/$GSDLOS$GSDLARCH/imagemagick" 
    221     export MAGICK_HOME 
    222    
    223         if test "$GSDLOS" = "linux" ; then 
    224             LD_LIBRARY_PATH="$GSDLHOME/bin/$GSDLOS$GSDLARCH/imagemagick/lib:$LD_LIBRARY_PATH" 
    225             export LD_LIBRARY_PATH 
    226          
    227         elif test "$GSDLOS" = "darwin" ; then 
    228             DYLD_LIBRARY_PATH="$GSDLHOME/bin/$GSDLOS$GSDLARCH/imagemagick/lib:$DYLD_LIBRARY_PATH" 
    229             export DYLD_LIBRARY_PATH 
    230         fi 
    231 fi 
     216# Imagemagick env vars are set in bin\script\gs-magick.pl 
    232217 
    233218