1 --- desktop/scripts/soffice.sh.orig 2003-09-22 12:07:01.000000000 -0700
2 +++ desktop/scripts/soffice.sh 2003-09-22 12:07:47.000000000 -0700
6 # extend the ld_library_path for java: javaldx checks the sofficerc for us
7 -java_ld_library_path=`"$sd_prog/javaldx"`
8 -if [ "$java_ld_library_path" != "" ] ; then
11 - LIBPATH=${java_ld_library_path}:${LIBPATH}
14 - DYLD_LIBRARY_PATH=${java_ld_library_path}:${DYLD_LIBRARY_PATH}
17 - SHLIB_PATH=${java_ld_library_path}:${SHLIB_PATH}
20 - LD_LIBRARYN32_PATH=${java_ld_library_path}:${LD_LIBRARYN32_PATH}
23 - LD_LIBRARY_PATH=${java_ld_library_path}:${LD_LIBRARY_PATH}
26 +if [ -x "$sd_prog/javaldx" ] ; then
27 + java_ld_library_path=`"$sd_prog/javaldx"`
28 + if [ "$java_ld_library_path" != "" ] ; then
29 + case $sd_platform in
31 + LIBPATH=${java_ld_library_path}:${LIBPATH}
34 + DYLD_LIBRARY_PATH=${java_ld_library_path}:${DYLD_LIBRARY_PATH}
37 + SHLIB_PATH=${java_ld_library_path}:${SHLIB_PATH}
40 + LD_LIBRARYN32_PATH=${java_ld_library_path}:${LD_LIBRARYN32_PATH}
43 + LD_LIBRARY_PATH=${java_ld_library_path}:${LD_LIBRARY_PATH}
49 # set java environment variables
50 --- desktop/source/javaldx/makefile.mk.orig 2003-09-22 12:07:12.000000000 -0700
51 +++ desktop/source/javaldx/makefile.mk 2003-09-22 12:11:42.000000000 -0700
54 # --- Files --------------------------------------------------------
56 +.IF "$(SOLAR_JAVA)"!=""
58 OBJFILES=$(OBJ)$/javaldx.obj
62 APP1STDLIBS+= -lstdc++
65 +.ENDIF # "$(SOLAR_JAVA)"!=""
67 # --- Targets ------------------------------------------------------