From c7361d388450f817bd7bb000adc304b8c054f09d Mon Sep 17 00:00:00 2001
From: juergen <juergen@5a81b35b-ba03-0410-adc8-b2c5c5119f08>
Date: Wed, 24 Mar 2010 09:04:24 +0000
Subject: [PATCH] fixing install issues
git-svn-id: https://dng.biozentrum.unibas.ch/svn/openstructure/trunk@1878 5a81b35b-ba03-0410-adc8-b2c5c5119f08
---
scripts/CMakeLists.txt | 2 +-
scripts/dng.bat.in | 6 +++---
scripts/dng.in | 2 +-
scripts/gipltng.bat.in | 4 ++--
scripts/gipltng.in | 2 +-
scripts/init_cl.py | 2 +-
scripts/ost.bat.in | 4 ++--
scripts/ost.in | 6 +++---
8 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index 42da73e15..ab3a32878 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -31,7 +31,7 @@ set(INIT_SCRIPTS
init_cl.py
init_iplt.py
)
-copy_if_different("./" "${STAGE_DIR}/lib/openstructure"
+copy_if_different("./" "${STAGE_DIR}/${LIB_DIR}/openstructure"
"${INIT_SCRIPTS}" "python init scripts" ost_scripts)
install(FILES ${INIT_SCRIPTS} DESTINATION "${LIB_DIR}/openstructure")
diff --git a/scripts/dng.bat.in b/scripts/dng.bat.in
index 7f94a071a..b54761f5c 100644
--- a/scripts/dng.bat.in
+++ b/scripts/dng.bat.in
@@ -26,6 +26,6 @@ set BIN_DIR=%~dp0
echo Starting DNG in %BIN_DIR%
set DNG_ROOT=%BIN_DIR%\..
-set PATH=%BIN_DIR%;%DNG_ROOT%\lib\Release;%DNG_ROOT%\lib;%DNG_ROOT%\bin\Release;%PATH%
-REM type %DNG_ROOT%\lib\openstructure\init.py | %BIN_DIR%@BUILD_TYPE@\gosty.exe ost %*
-type "%DNG_ROOT%\lib\openstructure\init.py" | "%BIN_DIR%Release\gosty.exe" ost %*
+set PATH=%BIN_DIR%;%DNG_ROOT%\@LIBDIR@\Release;%DNG_ROOT%\@LIBDIR@;%DNG_ROOT%\bin\Release;%PATH%
+REM type %DNG_ROOT%\@LIBDIR@\openstructure\init.py | %BIN_DIR%@BUILD_TYPE@\gosty.exe ost %*
+type "%DNG_ROOT%\@LIBDIR@\openstructure\init.py" | "%BIN_DIR%Release\gosty.exe" ost %*
diff --git a/scripts/dng.in b/scripts/dng.in
index 37c5a0d49..d0bf67cf2 100755
--- a/scripts/dng.in
+++ b/scripts/dng.in
@@ -30,4 +30,4 @@ export PATH=$BIN_DIR:$PATH
#export PYTHONHOME=$DNG_ROOT
#export QT_PLUGIN_PATH=$BIN_DIR/plugins
-cat "$DNG_ROOT/lib/openstructure/init.py" | gosty ost $@
\ No newline at end of file
+cat "$DNG_ROOT/@LIBDIR@/openstructure/init.py" | gosty ost $@
\ No newline at end of file
diff --git a/scripts/gipltng.bat.in b/scripts/gipltng.bat.in
index c3cff10ed..d57678355 100644
--- a/scripts/gipltng.bat.in
+++ b/scripts/gipltng.bat.in
@@ -26,5 +26,5 @@ set BIN_DIR=%~dp0
echo %BIN_DIR%
set DNG_ROOT=%BIN_DIR%\..
-set PATH=%BIN_DIR%;%DNG_ROOT%\lib\Release;%DNG_ROOT%\lib;%DNG_ROOT%\bin\Release;%PATH%
-type "%DNG_ROOT%\lib\openstructure\init_iplt.py" | "%BIN_DIR%Release\gosty.exe" ost %*
+set PATH=%BIN_DIR%;%DNG_ROOT%\@LIBDIR@\Release;%DNG_ROOT%\@LIBDIR@;%DNG_ROOT%\bin\Release;%PATH%
+type "%DNG_ROOT%\@LIBDIR@\openstructure\init_iplt.py" | "%BIN_DIR%Release\gosty.exe" ost %*
diff --git a/scripts/gipltng.in b/scripts/gipltng.in
index c7ebe96ca..87edb9f48 100755
--- a/scripts/gipltng.in
+++ b/scripts/gipltng.in
@@ -35,4 +35,4 @@ export PATH=$BIN_DIR:$PATH
# line. If the HERE documnt is fed directly into gosty, the backtrace shows the
# full command in case of a segfault which is very confusing and not helpful
# at all
-cat $DNG_ROOT/lib/openstructure/init_img.py| gosty img $@
+cat $DNG_ROOT/@LIBDIR@/openstructure/init_img.py| gosty img $@
diff --git a/scripts/init_cl.py b/scripts/init_cl.py
index 8d3e184f1..1e44100a3 100644
--- a/scripts/init_cl.py
+++ b/scripts/init_cl.py
@@ -4,7 +4,7 @@ if platform.machine()=='x86_64':
else:
sys.path.insert(0,os.getenv('DNG_ROOT')+'/lib/openstructure')
-from ost import io, mol, seq, gfx, conop
+from ost import io, mol, seq, gfx, conop, geom
import ost
try:
from ost import img
diff --git a/scripts/ost.bat.in b/scripts/ost.bat.in
index 729a63547..b9d87ea94 100644
--- a/scripts/ost.bat.in
+++ b/scripts/ost.bat.in
@@ -26,7 +26,7 @@ set SCRIPT_NAME=%0%
set BIN_DIR=%~dp0
set DNG_ROOT=%BIN_DIR%\..
-set PATH=%BIN_DIR%;%DNG_ROOT%\lib\Release;%DNG_ROOT%\lib;%DNG_ROOT%\bin\Release;%PATH%
+set PATH=%BIN_DIR%;%DNG_ROOT%\@LIBDIR@\Release;%DNG_ROOT%\@LIBDIR@;%DNG_ROOT%\bin\Release;%PATH%
REM retrieve absolute path to python executable
set pyexec=%BIN_DIR%\python.exe
@@ -50,6 +50,6 @@ if "%1" == "" (
echo passing commandline options %opts% to ost
)
-call "%pyexec%" %interact_% "%DNG_ROOT%\lib\openstructure\init_cl.py" %opts%
+call "%pyexec%" %interact_% "%DNG_ROOT%\@LIBDIR@\openstructure\init_cl.py" %opts%
diff --git a/scripts/ost.in b/scripts/ost.in
index 0a4c6274c..3e7597fc1 100755
--- a/scripts/ost.in
+++ b/scripts/ost.in
@@ -26,8 +26,8 @@ SCRIPT_NAME=$0
BIN_DIR=`dirname "$SCRIPT_NAME"`
export DNG_ROOT="$BIN_DIR/.."
export PATH=$PATH:"$BIN_DIR"
-export DYLD_FRAMEWORK_PATH="$BIN_DIR/../lib:${DYLD_FRAMEWORK_PATH}"
-export DYLD_LIBRARY_PATH="$BIN_DIR/../lib:${DYLD_LIBRARY_PATH}"
+export DYLD_FRAMEWORK_PATH="$BIN_DIR/../@LIBDIR@:${DYLD_FRAMEWORK_PATH}"
+export DYLD_LIBRARY_PATH="$BIN_DIR/../@LIBDIR@:${DYLD_LIBRARY_PATH}"
# set ld_library_path and pythonhome for bundle (commented except in linux bundles)
#export LD_LIBRARY_PATH=$DNG_ROOT/@LIBDIR@:$LD_LIBRARY_PATH
@@ -70,7 +70,7 @@ else
fi
# finally pass control to python instance
IFS="#"
-exec $pyexec $interactive "$DNG_ROOT/lib/openstructure/init_cl.py" $opts
+exec $pyexec $interactive "$DNG_ROOT/@LIBDIR@/openstructure/init_cl.py" $opts
IFS=$' \t\n'
--
GitLab