diff options
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/scripts/soffice.sh | 13 | ||||
| -rw-r--r-- | desktop/scripts/unopkg.sh | 13 | ||||
| -rw-r--r-- | desktop/source/deployment/misc/dp_platform.cxx | 3 |
3 files changed, 25 insertions, 4 deletions
diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh index 5a1d5c68e48c..ad8e6efd4dd6 100644 --- a/desktop/scripts/soffice.sh +++ b/desktop/scripts/soffice.sh @@ -121,8 +121,17 @@ if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then 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 - LD_LIBRARY_PATH=$my_path${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} - export LD_LIBRARY_PATH + sd_platform=`uname -s` + case $sd_platform in + AIX) + LIBPATH=$my_path${LIBPATH:+:$LIBPATH} + export LIBPATH + ;; + *) + LD_LIBRARY_PATH=$my_path${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} + export LD_LIBRARY_PATH + ;; + esac fi fi diff --git a/desktop/scripts/unopkg.sh b/desktop/scripts/unopkg.sh index 1f09b87eb1ef..7a8901525357 100644 --- a/desktop/scripts/unopkg.sh +++ b/desktop/scripts/unopkg.sh @@ -57,8 +57,17 @@ if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then 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 - LD_LIBRARY_PATH=$my_path${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} - export LD_LIBRARY_PATH + sd_platform=`uname -s` + case $sd_platform in + AIX) + LIBPATH=$my_path${LIBPATH:+:$LIBPATH} + export LIBPATH + ;; + *) + LD_LIBRARY_PATH=$my_path${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} + export LD_LIBRARY_PATH + ;; + esac fi fi diff --git a/desktop/source/deployment/misc/dp_platform.cxx b/desktop/source/deployment/misc/dp_platform.cxx index dda78930a510..1bf6819525b5 100644 --- a/desktop/source/deployment/misc/dp_platform.cxx +++ b/desktop/source/deployment/misc/dp_platform.cxx @@ -70,6 +70,7 @@ #define PLATFORM_OS2_X86 "os2_x86" +#define PLATFORM_AIX_POWERPC "aix_powerpc" @@ -184,6 +185,8 @@ namespace ret = checkOSandCPU(OUSTR("MacOSX"), OUSTR("PowerPC")); else if (token.equals(OUSTR(PLATFORM_OS2_X86))) ret = checkOSandCPU(OUSTR("OS2"), OUSTR("x86")); + else if (token.equals(OUSTR(PLATFORM_AIX_POWERPC))) + ret = checkOSandCPU(OUSTR("AIX"), OUSTR("PowerPC")); else { OSL_ENSURE(0, "Extension Manager: The extension supports an unknown platform. " |