From 3e9cea1f79b7c019964d858d3d88b922b366cc26 Mon Sep 17 00:00:00 2001
From: Marco Biasini <mvbiasini@gmail.com>
Date: Thu, 2 Aug 2012 16:56:54 +0200
Subject: [PATCH] fix path to site-packages in gosty
Setting the PYTHONPATH in ost_config is no longer required (This was
breaking stuff for projects relying on OpenStructure).
---
modules/gui/src/gosty.cc | 2 +-
scripts/ost_config.in | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/modules/gui/src/gosty.cc b/modules/gui/src/gosty.cc
index 670c454c1..b881e5093 100644
--- a/modules/gui/src/gosty.cc
+++ b/modules/gui/src/gosty.cc
@@ -117,7 +117,7 @@ void setup_python_search_path(const String& root, PythonInterpreter& pi)
# if (defined(__ppc64__) || defined(__x86_64__)) && !defined(__APPLE__)
pi.AppendModulePath(QString::fromStdString(root+"/lib64/"+
site_pkgs.str()+
- "site-packages"));
+ "/site-packages"));
# else
pi.AppendModulePath(QString::fromStdString(root+"/lib/"+
site_pkgs.str()+
diff --git a/scripts/ost_config.in b/scripts/ost_config.in
index fe0d9e841..f756d7cd3 100644
--- a/scripts/ost_config.in
+++ b/scripts/ost_config.in
@@ -30,7 +30,6 @@ 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}"
-export PYTHONPATH="$DNG_ROOT/@LIBDIR@/python@PYTHON_VERSION@/site-packages/:$OST_ADDITIONAL_PYTHONPATH"
# set QT_PLUGIN_PATH for bundle (commented except in linux bundles)
#export QT_PLUGIN_PATH="$BIN_DIR/plugins"
--
GitLab