diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-11-25 10:51:23 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-11-28 11:57:28 +0100 |
commit | eef94c1655605ce890f182e31f3cc64ee3748625 (patch) | |
tree | c0a62c22c25228ec0c210f16d9c7d07300f79d1a /desktop | |
parent | vcl: remove newlines from include/vcl/svapp.hxx (diff) | |
download | core-eef94c1655605ce890f182e31f3cc64ee3748625.tar.gz core-eef94c1655605ce890f182e31f3cc64ee3748625.zip |
Fold URE: Linux ure/bin/* -> program/
Change-Id: Id6cab518329829c22600f2a68b6b59abd04a564c
Diffstat (limited to 'desktop')
-rwxr-xr-x | desktop/scripts/unopkg.sh | 4 | ||||
-rw-r--r-- | desktop/unx/source/start.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/desktop/scripts/unopkg.sh b/desktop/scripts/unopkg.sh index d16d2269d454..3d244a438e18 100755 --- a/desktop/scripts/unopkg.sh +++ b/desktop/scripts/unopkg.sh @@ -65,8 +65,8 @@ do done # extend the ld_library_path for java: javaldx checks the sofficerc for us -if [ -x "$sd_prog/../ure-link/bin/javaldx" ] ; then - my_path=`"$sd_prog/../ure-link/bin/javaldx" $BOOTSTRAPVARS \ +if [ -x "$sd_prog/javaldx" ] ; then + my_path=`"$sd_prog/javaldx" $BOOTSTRAPVARS \ "-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"` if [ -n "$my_path" ] ; then sd_platform=`uname -s` diff --git a/desktop/unx/source/start.c b/desktop/unx/source/start.c index 5fb0dc3ee02e..9e5f7f1e0c81 100644 --- a/desktop/unx/source/start.c +++ b/desktop/unx/source/start.c @@ -704,7 +704,7 @@ exec_javaldx (Args *args) rtl_uString_newFromAscii( &pApp, "file://" ); rtl_uString_newConcat( &pApp, pApp, args->pAppPath ); pTmp = NULL; - rtl_uString_newFromAscii( &pTmp, "../ure-link/bin/javaldx" ); + rtl_uString_newFromAscii( &pTmp, "javaldx" ); rtl_uString_newConcat( &pApp, pApp, pTmp ); rtl_uString_release( pTmp ); |