diff options
Diffstat (limited to 'odk/setsdkenv_unix.sh.in')
| -rw-r--r-- | odk/setsdkenv_unix.sh.in | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/odk/setsdkenv_unix.sh.in b/odk/setsdkenv_unix.sh.in index bb3c16222628..0f6ef22519cd 100644 --- a/odk/setsdkenv_unix.sh.in +++ b/odk/setsdkenv_unix.sh.in @@ -143,7 +143,7 @@ case ${sdk_platform} in soext=so exampleout=SOLARISexample.out stldebug=_debug - LD_LIBRARY_PATH=${OO_SDK_OUT}/${directoryname}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:.:${LD_LIBRARY_PATH} + LD_LIBRARY_PATH=${OO_SDK_HOME}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:.:${LD_LIBRARY_PATH} export LD_LIBRARY_PATH ;; @@ -179,7 +179,7 @@ case ${sdk_platform} in exampleout=LINUXexample.out platform=Linux stldebug=_stldebug - LD_LIBRARY_PATH=${OO_SDK_OUT}/${directoryname}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:.:${LD_LIBRARY_PATH} + LD_LIBRARY_PATH=${OO_SDK_HOME}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:.:${LD_LIBRARY_PATH} export LD_LIBRARY_PATH ;; @@ -197,7 +197,7 @@ case ${sdk_platform} in exampleout=FREEBSDexample.out platform=FreeBSD stldebug=_stldebug - LD_LIBRARY_PATH=${OO_SDK_OUT}/${directoryname}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:.:${LD_LIBRARY_PATH} + LD_LIBRARY_PATH=${OO_SDK_HOME}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:.:${LD_LIBRARY_PATH} export LD_LIBRARY_PATH if [ -e "/sbin/sysctl" ] @@ -288,7 +288,8 @@ then rm -f "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppu.${soext}" \ "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppuhelper${comid}.${soext}" \ "${OO_SDK_OUT}/${directoryname}/lib/libuno_sal.${soext}" \ - "${OO_SDK_OUT}/${directoryname}/lib/libuno_salhelper${comid}.${soext}" + "${OO_SDK_OUT}/${directoryname}/lib/libuno_salhelper${comid}.${soext}" \ + "${OO_SDK_OUT}/${directoryname}/lib/libuno_purpenvhelper${comid}.${soext}" if [ -L "${OO_SDK_OUT}/${directoryname}/lib/libstlport_${pltfrm}${STLDEBUG}.${soext}" ] then @@ -307,6 +308,8 @@ then "${OO_SDK_OUT}/${directoryname}/lib/libuno_sal.${soext}" ln -s "${OO_SDK_URE_LIB_DIR}/libuno_salhelper${comid}.${soext}.3" \ "${OO_SDK_OUT}/${directoryname}/lib/libuno_salhelper${comid}.${soext}" + ln -s "${OO_SDK_URE_LIB_DIR}/libuno_purpenvhelper${comid}.${soext}.3" \ + "${OO_SDK_OUT}/${directoryname}/lib/libuno_purpenvhelper${comid}.${soext}" if [ -r "${OO_SDK_URE_LIB_DIR}/libstlport_${pltfrm}${STLDEBUG}.${soext}" ] then |