4491c0a22a
* [PATCH] Misc. openoffice.org-3-devel port patches [1] Submitted by: jkim Resource donated by: Nakamura Kazushi
50 lines
2 KiB
Text
50 lines
2 KiB
Text
--- configmgr/source/cmdtools/setofficelang.sh.orig 2008-06-09 08:42:48.000000000 -0400
|
|
+++ configmgr/source/cmdtools/setofficelang.sh 2008-06-27 15:47:37.000000000 -0400
|
|
@@ -75,6 +75,11 @@
|
|
export DYLD_LIBRARY_PATH
|
|
;;
|
|
|
|
+ FreeBSD)
|
|
+ LD_LIBRARY_PATH=${sd_prog}:${sd_prog}/../ure-link/lib${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}
|
|
+ export LD_LIBRARY_PATH
|
|
+ ;;
|
|
+
|
|
HP-UX)
|
|
SHLIB_PATH=${sd_prog}:/usr/openwin/lib${SHLIB_PATH+:${SHLIB_PATH}}
|
|
export SHLIB_PATH
|
|
--- desktop/scripts/soffice.sh.orig 2008-06-09 08:57:10.000000000 -0400
|
|
+++ desktop/scripts/soffice.sh 2008-06-27 16:12:58.000000000 -0400
|
|
@@ -75,6 +75,15 @@
|
|
|
|
# extend the ld_library_path for java: javaldx checks the sofficerc for us
|
|
if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then
|
|
+ # this is a temporary hack until we can live with the default search paths
|
|
+ case "`uname -s`" in
|
|
+ FreeBSD)
|
|
+ sd_prog1="$sd_prog/../basis-link/program"
|
|
+ sd_prog2="$sd_prog/../basis-link/ure-link/lib"
|
|
+ LD_LIBRARY_PATH=$sd_prog1:$sd_prog2${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}
|
|
+ export LD_LIBRARY_PATH
|
|
+ ;;
|
|
+ esac
|
|
my_path=`"$sd_prog/../basis-link/ure-link/bin/javaldx" $BOOTSTRAPVARS \
|
|
"-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"`
|
|
if [ -n "$my_path" ] ; then
|
|
--- padmin/source/spadmin.sh.orig 2008-06-27 01:18:09.000000000 -0400
|
|
+++ padmin/source/spadmin.sh 2008-06-27 13:31:09.000000000 -0400
|
|
@@ -58,6 +58,15 @@
|
|
|
|
# extend the ld_library_path for java: javaldx checks the sofficerc for us
|
|
if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then
|
|
+ # this is a temporary hack until we can live with the default search paths
|
|
+ case "`uname -s`" in
|
|
+ FreeBSD)
|
|
+ sd_prog1="$sd_prog/../basis-link/program"
|
|
+ sd_prog2="$sd_prog/../basis-link/ure-link/lib"
|
|
+ LD_LIBRARY_PATH=$sd_prog1:$sd_prog2${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}
|
|
+ export LD_LIBRARY_PATH
|
|
+ ;;
|
|
+ esac
|
|
my_path=`"$sd_prog/../basis-link/ure-link/bin/javaldx" $BOOTSTRAPVARS \
|
|
"-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"`
|
|
if [ -n "$my_path" ] ; then
|