Changeset 32238 for gs2-extensions/xpdf-tools/trunk/src/packages

Timestamp:

2018-07-05T20:51:36+12:00 (6 years 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).

File:

• gs2-extensions/xpdf-tools/trunk/src/packages/CASCADE-MAKE/CMAKE.sh (modified) (1 diff)

gs2-extensions/xpdf-tools/trunk/src/packages/CASCADE-MAKE/CMAKE.sh

@@ -34 +34 @@
 # Only compile up OUR cmake, and only if we haven't already got OUR cmake.
 # But don't use any system cmake: xpdf-tools is dependent on cmake version (>= 2.8.8)
-if [[ -x "$GEXTXPDFTOOLS_INSTALLED/linux/bin/cmake" ]]; then
-  echo "found cmake in $GEXTXPDFTOOLS_INSTALLED/linux/bin"
-  _CMAKE="$GEXTXPDFTOOLS_INSTALLED/linux/bin/cmake"
+if [[ -x "$GEXTXPDFTOOLS_INSTALLED/bin/cmake" ]]; then
+  echo "found cmake in $GEXTXPDFTOOLS_INSTALLED/bin"
+  _CMAKE="$GEXTXPDFTOOLS_INSTALLED/bin/cmake"
 fi