diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-06-09 12:29:28 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-06-09 12:29:28 +0000 |
| commit | 6c9a7ca74c8a180f7a81598d2884613f4af5ec94 (patch) | |
| tree | e179f0d6bc83b94f0d19e4110489607f4854fc3e /desktop/scripts | |
| parent | e56e83bfc1c61b246699b60623471eb13fcdf780 (diff) | |
INTEGRATION: CWS sb87 (1.11.12); FILE MERGED
2008/06/09 08:20:24 sb 1.11.12.2: resolved conflict against DEV300m17
2008/05/09 14:54:38 sb 1.11.12.1: #i88211# introduced vnd.sun.star.pathname pseudo URL feature for INIFILENAME and URE_BOOTSTRAP, dropped INIFILEPATH feature again in return
Diffstat (limited to 'desktop/scripts')
| -rw-r--r-- | desktop/scripts/unopkg.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/desktop/scripts/unopkg.sh b/desktop/scripts/unopkg.sh index a064906db8e7..a0d6c96d960c 100644 --- a/desktop/scripts/unopkg.sh +++ b/desktop/scripts/unopkg.sh @@ -9,7 +9,7 @@ # # $RCSfile: unopkg.sh,v $ # -# $Revision: 1.12 $ +# $Revision: 1.13 $ # # 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 @@ -76,5 +76,6 @@ PATH=$sd_prog${PATH+:$PATH} export PATH # execute binary -exec "$sd_prog/unopkg.bin" "$@" "-env:INIFILEPATH=$sd_prog/redirectrc" +exec "$sd_prog/unopkg.bin" "$@" \ + "-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc" |