Changeset 32238

Show
Ignore:
Timestamp:
05.07.2018 20:51:36 (5 months ago)
Author:
ak19
Message:

xpdftools is a GS2 extension, so should source its setup.bash, not gs3-setup.sh. And because of that, must remove the cyclical call to its devel.bash from its setup.bash, because devel.bash already sources setup.bash. (There was no cyclical call issue with gs3-setup.sh). Fixed a mistake in a print statement in CMAKE.sh, the echoed path to cmake was not correct. Fortunately, the rest of the code doesn't use this path (the _CMAKE variable).

Location:
gs2-extensions/xpdf-tools/trunk/src
Files:
3 modified

Legend:

Unmodified
Added
Removed
  • gs2-extensions/xpdf-tools/trunk/src/devel.bash

    r32227 r32238  
    66 
    77if [ -z $GEXT_XPDFTOOLS ] ; then 
    8   source gs3-setup.sh 
     8#  source gs3-setup.sh 
     9 source setup.bash 
    910fi 
    1011 
  • gs2-extensions/xpdf-tools/trunk/src/packages/CASCADE-MAKE/CMAKE.sh

    r32234 r32238  
    3434# Only compile up OUR cmake, and only if we haven't already got OUR cmake. 
    3535# But don't use any system cmake: xpdf-tools is dependent on cmake version (>= 2.8.8) 
    36 if [[ -x "$GEXTXPDFTOOLS_INSTALLED/linux/bin/cmake" ]]; then 
    37   echo "found cmake in $GEXTXPDFTOOLS_INSTALLED/linux/bin" 
    38   _CMAKE="$GEXTXPDFTOOLS_INSTALLED/linux/bin/cmake" 
     36if [[ -x "$GEXTXPDFTOOLS_INSTALLED/bin/cmake" ]]; then 
     37  echo "found cmake in $GEXTXPDFTOOLS_INSTALLED/bin" 
     38  _CMAKE="$GEXTXPDFTOOLS_INSTALLED/bin/cmake" 
    3939fi 
    4040 
  • gs2-extensions/xpdf-tools/trunk/src/setup.bash

    r32228 r32238  
    6767fi 
    6868 
     69# XPDFTOOLS is a GS2 extension, as it should be common to GS2 and GS3. 
     70# This becomes circular if done in a GS2 extension. 
     71# But in a GS3 extension, devel.bash should source gs3-setup.sh which doesn't source devel.bash 
    6972# From http://trac.greenstone.org/browser/other-projects/trunk/realistic-books/setup.bash 
    70 if [ -e devel.sh ] ; then 
    71     source devel.sh $* 
    72 fi 
     73#if [ -e devel.sh ] ; then 
     74#    source devel.sh $* 
     75#fi