SimDist/scripts
diff -u -r1.6 -r1.7
--- slic-ldpath.sh.in 18 Jul 2012 23:03:42 -0000 1.6
+++ slic-ldpath.sh.in 31 Aug 2012 20:30:33 -0000 1.7
@@ -14,24 +14,26 @@
# Check that SIMDIST_HOME is setup and has a known sub-directory. Messed up or incomplete
# directory structure could get by this check, but it is probably good enough.
if [ -z "${SIMDIST_HOME}" ]; then
- echo "ERROR: Required SIMDIST_HOME variable is not set in environment."
+ echo "ERROR: Required SIMDIST_HOME variable is not set in environment."
else
if [ -d ${SIMDIST_HOME}/packages/slic ]; then
- echo "SIMDIST_HOME=${SIMDIST_HOME}"
+ echo "SIMDIST_HOME=${SIMDIST_HOME}"
- # FIXME: Is this the correct Qt dir?
- if [ "@QTHOME@" != "" ]; then
- QT_LIB_DIR=@QTHOME@/lib
- fi
- # Set the platform's load path variable.
- unset @OS_SHARED_LIBS_VAR@
- export @OS_SHARED_LIBS_VAR@=${SIMDIST_HOME}/lib
+ # Set the platform's load path variable.
+ unset @OS_SHARED_LIBS_VAR@
+ export @OS_SHARED_LIBS_VAR@=${SIMDIST_HOME}/lib
- echo "@OS_SHARED_LIBS_VAR@=${@OS_SHARED_LIBS_VAR@}"
+ # FIXME: Is this the correct Qt dir?
+ if [ "@QTHOME@" != "" ]; then
+ QT_LIB_DIR=@QTHOME@/lib
+ export @OS_SHARED_LIBS_VAR@=${@OS_SHARED_LIBS_VAR@}:${QT_LIB_DIR}
+ fi
+
+ echo "@OS_SHARED_LIBS_VAR@=${@OS_SHARED_LIBS_VAR@}"
else
- echo "ERROR: $SIMDIST_HOME doesn't appear to point to a valid SimDist installation!"
+ echo "ERROR: $SIMDIST_HOME doesn't appear to point to a valid SimDist installation!"
fi
fi
@@ -45,4 +47,4 @@
#LCDD_LIB_DIR=${SIMDIST_HOME}/packages/lcdd/@LCDD_VERSION@/lib
#HEPPDT_LIB_DIR=${SIMDIST_HOME}/packages/heppdt/@[log in to unmask]
#HEPPID_LIB_DIR=${SIMDIST_HOME}/packages/heppdt/@[log in to unmask]
-#SLIC_LIB_DIR=${SIMDIST_HOME}/packages/slic/@SLIC_VERSION@/lib
\ No newline at end of file
+#SLIC_LIB_DIR=${SIMDIST_HOME}/packages/slic/@SLIC_VERSION@/lib