INTEGRATION: CWS ooo11rc2 (1.7.22); FILE MERGED

2003/07/15 03:35:38 fa 1.7.22.1: Fixes for darwin/DYLD_LIBRARY_PATH in scripts, also
in d.lst for dylib delivery, and in the pagein stuff for
OS X.

http://www.openoffice.org/issues/show_bug.cgi?id=16858

Contributor:
Kevin Hendricks

Dan
fa@ooo

desktop/scripts/soffice.sh

@@ -122,6 +122,11 @@ case $sd_platform in
     export LIBPATH
     ;;
 
+  Darwin)
+    DYLD_LIBRARY_PATH="$sd_progsub":"$sd_prog":$DYLD_LIBRARY_PATH
+    export DYLD_LIBRARY_PATH
+    ;;
+
   HP-UX)
     SHLIB_PATH="$sd_progsub":"$sd_prog":/usr/openwin/lib:$SHLIB_PATH
     export SHLIB_PATH
@@ -145,6 +150,9 @@ if [ "$java_ld_library_path" != "" ] ; then
         AIX)
             LIBPATH=${java_ld_library_path}:${LIBPATH}
             ;;
+        Darwin)
+            DYLD_LIBRARY_PATH=${java_ld_library_path}:${DYLD_LIBRARY_PATH}
+            ;;
         HP-UX)
             SHLIB_PATH=${java_ld_library_path}:${SHLIB_PATH}
             ;;