From 16e3bd15d08606676519aaa71e18a7b2d6e27cf4 Mon Sep 17 00:00:00 2001
From: Andreas Schenk <andreas_schenk@hms.harvard.edu>
Date: Mon, 30 Apr 2012 17:49:14 -0400
Subject: [PATCH] fixed some spelling errors in ost_config variables fixed
python version in ost_config PYTHONPATH
---
scripts/CMakeLists.txt | 3 ++-
scripts/ost_config.in | 14 ++++++--------
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index f71f15327..734e377e8 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -1,4 +1,5 @@
-set(SUBST_DICT BUILD_TYPE=${CMAKE_BUILD_TYPE} PYTHON_BINARY=${PYTHON_BINARY} LIBDIR=${LIB_DIR} LIBEXEC_PATH=${LIBEXEC_PATH})
+set(SUBST_DICT BUILD_TYPE=${CMAKE_BUILD_TYPE} PYTHON_BINARY=${PYTHON_BINARY}
+PYTHON_VERSION=${PYTHON_VERSION} LIBDIR=${LIB_DIR} LIBEXEC_PATH=${LIBEXEC_PATH})
message("${BUILD_TYPE}")
add_custom_target(ost_scripts ALL)
diff --git a/scripts/ost_config.in b/scripts/ost_config.in
index b7b8b7c3e..faaae8e26 100644
--- a/scripts/ost_config.in
+++ b/scripts/ost_config.in
@@ -26,15 +26,13 @@ export DNG_BINDIR="$DNG_ROOT/bin"
export DNG_LIBDIR="$DNG_ROOT/@LIBDIR@"
export DNG_INITDIR="$DNG_LIBDIR/openstructure"
-export PATH="$DNG_BINDIR:$PATH"
-export DYLD_FRAMEWORK_PATH="$BIN_LIBDIR:${DYLD_FRAMEWORK_PATH}"
-export DYLD_LIBRARY_PATH="$BIN_LIBDIR:${DYLD_LIBRARY_PATH}"
-export LD_LIBRARY_PATH="$DNG_LIBDIR:$LD_LIBRARY_PATH"
-# set QT_PLUGIN_PATH PYTHONHOME and PYTHONPATH for bundle (commented except in linux bundles)
-# set QT_PLUGIN_PATH and pythonpath for bundle (commented except in linux bundles)
-#export QT_PLUGIN_PATH="$BIN_DIR/plugins"
-#export PYTHONPATH="$DNG_ROOT/@LIBDIR@/python2.6:$OST_ADDITIONAL_PYTHONPATH"
+export PATH="$DNG_BINDIR:${PATH}"
+export DYLD_FRAMEWORK_PATH="$DNG_LIBDIR:${DYLD_FRAMEWORK_PATH}"
+export DYLD_LIBRARY_PATH="$DNG_LIBDIR:${DYLD_LIBRARY_PATH}"
+export LD_LIBRARY_PATH="$DNG_LIBDIR:${LD_LIBRARY_PATH}"
+# set QT_PLUGIN_PATH and PYTHONPATH for bundle (commented except in linux bundles)
#export QT_PLUGIN_PATH="$BIN_DIR/plugins"
+#export PYTHONPATH="$DNG_ROOT/@LIBDIR@/python@PYTHON_VERSION@:$OST_ADDITIONAL_PYTHONPATH"
# retrieve absolute path to python executable
pyexec="@PYTHON_BINARY@"
--
GitLab