summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2008-06-09 11:49:35 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2008-06-09 11:49:35 +0000
commite083ad3d5c77671acc47c367c18e3c83a9adb234 (patch)
tree437a3e43a4ff959d50dbc903d6ce831c4b4146b4
parent2c9b816ea756c758c21fc761d7ae1ce29b9ba3cc (diff)
INTEGRATION: CWS sb87 (1.3.6); FILE MERGED
2008/05/09 14:57:52 sb 1.3.6.1: #i88211# introduced vnd.sun.star.pathname pseudo URL feature for INIFILENAME and URE_BOOTSTRAP, dropped INIFILEPATH feature again in return
-rw-r--r--padmin/source/spadmin.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/padmin/source/spadmin.sh b/padmin/source/spadmin.sh
index 28f86e9fd5ad..b128c002c99b 100644
--- a/padmin/source/spadmin.sh
+++ b/padmin/source/spadmin.sh
@@ -9,7 +9,7 @@
#
# $RCSfile: spadmin.sh,v $
#
-# $Revision: 1.3 $
+# $Revision: 1.4 $
#
# This file is part of OpenOffice.org.
#
@@ -59,7 +59,7 @@ done
# extend the ld_library_path for java: javaldx checks the sofficerc for us
if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then
my_path=`"$sd_prog/../basis-link/ure-link/bin/javaldx" $BOOTSTRAPVARS \
- "-env:INIFILEPATH=$sd_prog/redirectrc"`
+ "-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"`
if [ -n "$my_path" ] ; then
LD_LIBRARY_PATH=$my_path${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}
export LD_LIBRARY_PATH
@@ -77,4 +77,4 @@ export PATH
# execute binary
exec "$sd_prog/../basis-link/program/spadmin.bin" "$@" \
- "-env:INIFILEPATH=$sd_prog/redirectrc"
+ "-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"