CWS-TOOLING: integrate CWS sb104

2009-01-27 13:09:06 +0100 sb  r266986 : #i97992# cws rebase: merged cws/sb104/config_office/set_soenv.in with moved tags/DEV300_m40/set_soenv.in
2009-01-27 10:56:40 +0100 sb  r266966 : CWS-TOOLING: rebase CWS sb104 to trunk@266944 (milestone: DEV300:m40)
2009-01-20 14:37:00 +0100 sb  r266581 : #i97992# missing treatment of Solaris-only adjustvisibility as build-internal tool
2009-01-20 09:32:38 +0100 sb  r266554 : CWS-TOOLING: rebase CWS sb104 to trunk@266428 (milestone: DEV300:m39)
2009-01-14 13:40:45 +0100 sb  r266296 : #i97992# do not pass comment lines to shell
2009-01-14 12:50:34 +0100 sb  r266290 : #i97992# avoid problems with checkdll not finding AWTLIB and its dependents
2009-01-14 12:49:20 +0100 sb  r266289 : #i97992# on Linux and Solaris, regxpcom apparently needs to be called with the libxpcom.so directory on the LD_LIBRARY_PATH
2009-01-13 09:41:37 +0100 sb  r266196 : #i97992# fixed AUGMENT_LIBRARY_PATH definitions
2009-01-12 18:02:03 +0100 sb  r266177 : #i97992# get rid of LD_LIBRARY_PATH in build environment

19 files changed, 171 insertions, 176 deletions

diff --git a/set_soenv.in b/set_soenv.in
index 1f7c516ee000..be1cae0d966c 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -62,7 +62,7 @@ my ( $CALL_CDECL, $COMMON_OUTDIR, $BMP_WRITES_FLAG,
 my ( $BIG_SVX, $COM, $ARCH, $CPU, $CPUNAME, $CVER, $GLIBC, $GUI, $GUIBASE,
       $GVER, $OS, $OSVERSION, $OUTPATH, $INPATH, $PATH_SEPERATOR,
       $DYNAMIC_CRT, $SET_EXCEPTIONS, $use_shl_versions, $CDPATHx, $JRELIBDIR,
-      $JREEXTRALIBDIR, $JRETOOLKITDIR, $JRETHREADDIR,
+      $JRETOOLKITDIR, $JRETHREADDIR,
       $FLIPCMD );
 #
 #-------------------------------------------
@@ -83,7 +83,7 @@ my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $JDK, $JAVAFLAGS, $SHELL,
      $STAR_INIROOT, $STAR_INIROOTOLD, $STAR_STANDLST, $STAR_SSCOMMON, $STAR_SSOLARINI, 
      $DMAKEROOT, $CLASSPATH, $XCLASSPATH, $COMPATH,
      $MSPDB_PATH, $MIDL_PATH, $CSC_PATH,
-     $LD_LIBRARY_PATH, $PATH, $SOLAREXTRAINC, $SOLAREXTRALIB, $SOLARLIB, 
+     $PATH, $SOLAREXTRAINC, $SOLAREXTRALIB, $SOLARLIB, 
      $SOLARINC, $LOCALINI, $FRAMEWORKSHOME, $COMEX, $PERL, 
      $COMP_ENV, $ILIB, $JAVAHOME, $PSDK_HOME, $DIRECTXSDK_LIB, $USE_NEW_SDK, $FRAME_HOME, 
      $USE_DIRECTX5, $ATL_LIB, $ATL_INCLUDE, $MFC_LIB, $MFC_INCLUDE, $NO_HIDS, $TEMP,
@@ -200,9 +200,6 @@ $NO_BSYMBOLIC         = "TRUE";
 $comment              = "#";           # UNIX script comment character
 $comment4nt           = "rem";         # Windows 4nt script comment character
 
-# Some JREs do not need the following variable.
-$JREEXTRALIBDIR = "";
-
 # Setting platform dependent constant values.
 if ( $platform =~ m/solaris/ ) 
 {     print "Setting Solaris specific values... ";
@@ -330,13 +327,11 @@ elsif ( $platform =~ m/freebsd/ )
       {  $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
          $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
          $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
-         $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."xawt";
       }
       else
       {  $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64";
          $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."server";
          $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."native_threads";
-         $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."xawt";
       }
    }
    elsif ($platform =~ m/^i386/)
@@ -348,7 +343,6 @@ elsif ( $platform =~ m/freebsd/ )
       $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
       $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
       $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
-      $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."xawt";
    }
    else
    {  print "Unsupported FreeBSD architecture: $platform \n";
@@ -387,13 +381,11 @@ elsif ( $platform =~ m/linux/ )
 
       elsif ($JDK =~ m/^[Bb][Ee][Aa]/)
       { $JRELIBDIR     = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
-        $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."xawt";
         $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."jrockit";
         $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads"; }
 
       else {      
       $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
-       $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."xawt";
       # has both server and client
       $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
       $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
@@ -419,7 +411,6 @@ elsif ( $platform =~ m/linux/ )
       # has both server and client
       $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."server";
       $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."native_threads";
-      $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."amd64".$ds."xawt";
    }
    elsif ($platform =~ m/^ia64/)
    {  print "Setting Linux ia64 specific values... ";
@@ -431,7 +422,6 @@ elsif ( $platform =~ m/linux/ )
       $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ia64";
       $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ia64".$ds."server";
       $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ia64".$ds."native_threads";
-      $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ia64".$ds."xawt";
    }
    elsif ($platform =~ m/^sparc/)
  
@@ -443,7 +433,6 @@ elsif ( $platform =~ m/linux/ )
       $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc";
       $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc".$ds."server";
       $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc".$ds."native_threads";
-      $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."sparc".$ds."xawt";
    }
    elsif ($platform =~ m/^powerpc/)
    {
@@ -473,14 +462,12 @@ elsif ( $platform =~ m/linux/ )
          {  $JRELIBDIR     = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
             $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."classic";
             $JRETHREADDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
-            $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."xawt";
          }
 	 # OpenJDK
 	 elsif ($JDK =~ m/sun/) {
 	    $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
 	    $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."client";
 	    $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."native_threads";
-	    $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."xawt";
 	 }
       }
 
@@ -506,7 +493,6 @@ elsif ( $platform =~ m/linux/ )
       $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds.$ARCH;
       $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds.$ARCH.$ds."server";
       $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds.$ARCH.$ds."native_threads";
-      $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds.$ARCH.$ds."xawt";
       $CPU            = "3";
    }
    elsif ($platform =~ m/^m68k/)
@@ -519,7 +505,6 @@ elsif ( $platform =~ m/linux/ )
       $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."m68k";
       $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."m68k".$ds."server";
       $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."m68k".$ds."native_threads";
-      $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."m68k".$ds."xawt";
    }
    elsif ($platform =~ m/^alpha/) 
    {  print "Setting Linux Alpha specific values... ";
@@ -540,7 +525,6 @@ elsif ( $platform =~ m/linux/ )
       $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."arm";
       $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."arm".$ds."server";
       $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."arm".$ds."native_threads";
-      $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."arm".$ds."xawt";
       $EPM_FLAGS      = "-a arm";
    }
    elsif ($platform =~ m/^mips/)
@@ -579,7 +563,6 @@ elsif ( $platform =~ m/linux/ )
       $JRELIBDIR      = '$JAVA_HOME'.$ds."lib".$ds.$ARCH;
       $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."lib".$ds.$ARCH.$ds."client";
       $JRETHREADDIR   = '$JAVA_HOME'.$ds."lib".$ds.$ARCH.$ds."native_threads";
-      $JREEXTRALIBDIR = '$JAVA_HOME'.$ds."lib".$ds.$ARCH.$ds."xawt";
    }
 
 
@@ -1059,52 +1042,6 @@ $CLASSPATH            = '$JAVA_HOME'.$ds.'jre'.$LIB.$ds."rt.jar".$wps.'.';
 # see above for why the change
 $XCLASSPATH           = '$JAVA_HOME'.$ds.'jre'.$LIB.$ds."rt.jar".$wps.'.';
 
-# Paths to run time shared libraries.
-if ($platform =~ m/solaris/) 
-{  $LD_LIBRARY_PATH   = $cur_dir.
-                        $ps.$USR_DT.$LIB.
-                        $ps.$USR_OPENWIN.$LIB.
-                        $ps.$USR_LOCAL.$LIB.
-                        $ps.$par_dir.$LIB.
-                        $ps_STLPORT_LIB.
-                        $ps.$JRELIBDIR.
-			$ps.$JREEXTRALIBDIR.
-                        $ps.$JRETOOLKITDIR.
-                        $ps.$JRETHREADDIR.
-                        $ps.'$SOLARVER'.$ds.'$INPATH'.$LIB;
-}
-elsif ($platform =~ m/linux|netbsd|osf1|freebsd|aix/)
-{  $LD_LIBRARY_PATH   = $cur_dir.
-                        $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
-                        $ps.$JRELIBDIR.
-			$ps.$JREEXTRALIBDIR.
-                        $ps.$JRETOOLKITDIR.
-                        $ps.$JRETHREADDIR.
-                        $ps.$par_dir.$LIB64.
-                        $ps_STLPORT_LIB.
-                        $ps.'$SOLARVER'.$ds.'$INPATH'.$LIB.
-                       $ps.$ENV{'LD_LIBRARY_PATH'};
-}
-elsif ($platform =~ m/irix/)
-{  $LD_LIBRARY_PATH   = $cur_dir.
-                        $ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
-                        $ps.$JRELIBDIR.
-			$ps.$JREEXTRALIBDIR.
-                        $ps.$JRETOOLKITDIR.
-                        $ps.$JRETHREADDIR.
-                        $ps.$USR_LOCAL.$LIB.
-                        $ps.$par_dir.$LIB.
-                        $ps.'$SOLARVER'.$ds.'$INPATH'.$LIB;
-}
-elsif ($platform =~ m/darwin/)
-{  $LD_LIBRARY_PATH   = $cur_dir.
-                        $ps.'$SOLARVER'.$ds.'$INPATH'.$LIB.
-                        $ps_STLPORT_LIB;
-}
-elsif ($platform !~ m/cygwin|os2/)
-{  AddWarning( "set_soenv", "$platform not configured for runtime shared libraries" );
-}
-	
 # Location used by the linker to create libraries.
 if ($platform =~ m/solaris/) 
 {  $SOLAREXTRALIB     = $L.$par_dir.$LIB.
@@ -1849,17 +1786,6 @@ if ( '@JDK@' ne '' )
    ToFile( "JAVAAOTCOMPILER", PathFormat("@JAVAAOTCOMPILER@"), "e" );
    ToFile( "JAVADOC",         PathFormat("@JAVADOC@"), "e" );
 }
-if ( $platform =~ m/darwin/ )
-{  ToFile( "DYLD_LIBRARY_PATH", $LD_LIBRARY_PATH,   "e" );
-}
-else {
-  if ( $platform =~ m/irix/ ) {
-    ToFile( "LD_LIBRARYN32_PATH",   $LD_LIBRARY_PATH,   "e" );
-  }
-  else {
-    ToFile( "LD_LIBRARY_PATH",   $LD_LIBRARY_PATH,   "e" );
-  }
-}
 ToFile( "SCPDEFS",           '@SCPDEFS@',        "e" );
 ToFile( "SOLAREXTRAINC",     $SOLAREXTRAINC,     "e" );
 ToFile( "SOLAREXTRALIB",     $SOLAREXTRALIB,     "e" );
diff --git a/solenv/bin/cwscheckapi b/solenv/bin/cwscheckapi
index fe5ecc1deb3f..357a40a20ee5 100755
--- a/solenv/bin/cwscheckapi
+++ b/solenv/bin/cwscheckapi
@@ -138,7 +138,6 @@ LOCALUNPACKDIR=$CWSCHECKAPIPATH/unpack
 export LOCALINSTALLDIR
 export LOCALUNPACKDIR
 
-unset LD_LIBRARY_PATH
 unset FORCE2ARCHIVE
 
 date 2>&1
@@ -244,10 +243,10 @@ fi
 
 #XDEBUG=" -Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=8001 " 
 COMMAND="$JAVABIN -Xmx120m $XDEBUG -cp $myCLASSPATH org.openoffice.Runner $PARAM $*"
-echo "( unset LD_LIBRARY_PATH ; unset DYLD_LIBRARY_PATH; $COMMAND )"
+echo "$COMMAND"
 
 LOGFILE=$CWSCHECKAPIPATH/cwscheckapi.log
-( unset LD_LIBRARY_PATH ; unset DYLD_LIBRARY_PATH; $COMMAND | tee $LOGFILE)
+$COMMAND | tee $LOGFILE
 
 if [ $KEEPOFFICE = false ]; then
     echo "remove office instrallation in $LOCALINSTALLDIR..."
diff --git a/solenv/bin/installoffice b/solenv/bin/installoffice
index bd8053f64627..602934958b53 100755
--- a/solenv/bin/installoffice
+++ b/solenv/bin/installoffice
@@ -94,7 +94,6 @@ LOCALUNPACKDIR=$DESTPATH/unpack
 export LOCALINSTALLDIR
 export LOCALUNPACKDIR
 
-unset LD_LIBRARY_PATH
 unset FORCE2ARCHIVE
 
 echo "### $SOLARENV/bin/installoffice.pl $PARAM -cleanup true $@"
diff --git a/solenv/bin/macosx-change-install-names.pl b/solenv/bin/macosx-change-install-names.pl
index 3c05c06e3d77..fcda2621abc5 100644
--- a/solenv/bin/macosx-change-install-names.pl
+++ b/solenv/bin/macosx-change-install-names.pl
@@ -41,6 +41,8 @@ sub action($$$)
          'app/SDK/URELIB' => '@executable_path/../../ure-link/lib',
          'app/BRAND/URELIB' => '@executable_path/../basis-link/ure-link/lib',
          'app/BRAND/OOO' => '@executable_path/../basis-link/program',
+         'app/NONE/URELIB' => '@__VIA_LIBRARY_PATH__',
+         'app/NONE/OOO' => '@__VIA_LIBRARY_PATH__',
          'shl/URELIB/URELIB' => '@loader_path',
          'shl/OOO/URELIB' => '@loader_path/../ure-link/lib',
          'shl/OOO/OOO' => '@loader_path',
@@ -51,8 +53,8 @@ sub action($$$)
     return $act;
 }
 
-@ARGV == 3 || @ARGV >= 2 && $ARGV[0] eq "extshl" or
-    die "Usage: app|shl|extshl UREBIN|URELIB|OOO|BRAND|OXT|NONE <filepath>*";
+@ARGV == 3 || @ARGV >= 2 && $ARGV[0] eq "extshl" or die
+    'Usage: app|shl|extshl UREBIN|URELIB|OOO|SDK|BRAND|OXT|NONE <filepath>*';
 $type = shift @ARGV;
 $loc = shift @ARGV;
 if ($type eq "extshl")
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index 4e2f8b96080c..bdbb965428a0 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -110,6 +110,7 @@ BEGIN
     $servicesrdb_can_be_created = 0;
     $islinux = 0;
     $issolaris = 0;
+    $ismacosx = 0;
     $iswindowsbuild = 0;
     $islinuxbuild = 0;
     $islinuxrpmbuild = 0;
@@ -502,6 +503,7 @@ BEGIN
 
     if ( $plat =~ /linux/i ) { $islinux = 1; }
     if ( $plat =~ /solaris/i ) { $issolaris = 1; }
+    if ( $plat =~ /darwin/i ) { $ismacosx = 1; }
 
     # ToDo: Needs to be expanded for additional platforms
 
diff --git a/solenv/bin/modules/installer/regmerge.pm b/solenv/bin/modules/installer/regmerge.pm
index 265317f08470..bb6461b00d7d 100644
--- a/solenv/bin/modules/installer/regmerge.pm
+++ b/solenv/bin/modules/installer/regmerge.pm
@@ -242,12 +242,30 @@ sub merge_files
 
         my @regmergeoutput = ();
 
+        my $var_library_path;
+        my $old_library_path;
+        if ($installer::globals::isunix) {
+            $var_library_path = $installer::globals::ismacosx ?
+                'DYLD_LIBRARY_PATH' : 'LD_LIBRARY_PATH';
+            $old_library_path = $ENV{$var_library_path};
+            installer::servicesfile::include_libdir_into_ld_library_path(
+                $var_library_path, $regmergefile);
+        }
+
         open (REG, "$systemcall");
         while (<REG>) {push(@regmergeoutput, $_); }
         close (REG);
 
         my $returnvalue = $?;   # $? contains the return value of the systemcall
 
+        if (defined $var_library_path) {
+            if (defined $old_library_path) {
+                $ENV{$var_library_path} = $old_library_path;
+            } else {
+                delete $ENV{$var_library_path};
+            }
+        }
+
         my $infoline = "Systemcall: $systemcall\n";
         push( @installer::globals::logfileinfo, $infoline);
 
diff --git a/solenv/bin/modules/installer/servicesfile.pm b/solenv/bin/modules/installer/servicesfile.pm
index 56a4c4d2dfcf..1e21c39cdef3 100644
--- a/solenv/bin/modules/installer/servicesfile.pm
+++ b/solenv/bin/modules/installer/servicesfile.pm
@@ -459,30 +459,28 @@ sub register_all_components
 # the LD_LIBRARY_PATH for Unix platforms
 ###################################################
 
-sub include_regcomp_into_ld_library_path
+sub include_libdir_into_ld_library_path
 {
-    my ( $regcompfileref ) = @_;
+    my ( $var, $binfile ) = @_;
 
-    my $ld_library_path = $$regcompfileref;
+    my $ld_library_path = $binfile;
     installer::pathanalyzer::get_path_from_fullqualifiedname(\$ld_library_path);
     $ld_library_path =~ s/\/\s*$//;     # removing ending slashes
     $ld_library_path =~ s/\/bin\./\/lib\./;
     $ld_library_path =~ s/\/bin\s*$/\/lib/; # when packing from flat
 
-    my $oldldlibrarypathstring = "";
-    if ( $ENV{'LD_LIBRARY_PATH'} ) { $oldldlibrarypathstring = $ENV{'LD_LIBRARY_PATH'}; }
-    else { $oldldlibrarypathstring = "\."; }
+    my $oldldlibrarypathstring = $ENV{$var};
     my $new_ld_library_path = $ld_library_path;
-    if ( $oldldlibrarypathstring ne "" ) {
+    if ( defined $oldldlibrarypathstring ) {
         $new_ld_library_path = $new_ld_library_path . $installer::globals::pathseparator . $oldldlibrarypathstring;
     }
     if ( $ENV{'SYSTEM_MOZILLA'} && $ENV{'SYSTEM_MOZILLA'} eq "YES" &&
       (!$ENV{'WITH_OPENLDAP'} || $ENV{'WITH_OPENLDAP'} ne "YES")) {
         $new_ld_library_path = $new_ld_library_path . $installer::globals::pathseparator . $ENV{'MOZ_LIB'};
     }
-    $ENV{'LD_LIBRARY_PATH'} = $new_ld_library_path;
+    $ENV{$var} = $new_ld_library_path;
 
-    my $infoline = "Setting LD_LIBRARY_PATH to $ENV{'LD_LIBRARY_PATH'}\n";
+    my $infoline = "Setting $var to $ENV{$var}\n";
     push( @installer::globals::logfileinfo, $infoline);
 }
 
@@ -532,14 +530,18 @@ sub prepare_classpath_for_java_registration
 
 sub add_jdklib_into_ld_library_path
 {
-    my $oldldlibrarypathstring = "";
-    if ( $ENV{'LD_LIBRARY_PATH'} ) { $oldldlibrarypathstring = $ENV{'LD_LIBRARY_PATH'}; }
-    else { $oldldlibrarypathstring = "\."; }
-    my $new_ld_library_path = $installer::globals::jdklib . $installer::globals::pathseparator . $oldldlibrarypathstring;
-    $ENV{'LD_LIBRARY_PATH'} = $new_ld_library_path;
-
-    my $infoline = "Setting LD_LIBRARY_PATH to $ENV{'LD_LIBRARY_PATH'}\n";
-    push( @installer::globals::logfileinfo, $infoline);
+    my ($var) = @_;
+    if (defined $installer::globals::jdklib) {
+        my $oldldlibrarypathstring = $ENV{$var};
+        my $new_ld_library_path = $installer::globals::jdklib;
+        if (defined $oldldlibrarypathstring) {
+            $new_ld_library_path .=
+                $installer::globals::pathseparator . $oldldlibrarypathstring;
+        }
+        $ENV{$var} = $new_ld_library_path;
+        my $infoline = "Setting $var to $ENV{$var}\n";
+        push( @installer::globals::logfileinfo, $infoline);
+    }
 }
 
 ##################################################################
@@ -964,7 +966,15 @@ sub create_services_rdb
                 # Linux: Take care of the lock daemon. He has to be started!
                 # For windows it is necessary that "msvcp7x.dll" and "msvcr7x.dll" are included into the path !
 
-                if ( $installer::globals::isunix ) { include_regcomp_into_ld_library_path($regcompfileref); }
+                my $var_library_path;
+                my $old_library_path;
+                if ( $installer::globals::isunix ) {
+                    $var_library_path = $installer::globals::ismacosx ?
+                        'DYLD_LIBRARY_PATH' : 'LD_LIBRARY_PATH';
+                    $old_library_path = $ENV{$var_library_path};
+                    include_libdir_into_ld_library_path(
+                        $var_library_path, $$regcompfileref);
+                }
 
                 my $regcomprdb = "";
 
@@ -972,7 +982,8 @@ sub create_services_rdb
                 {
                     prepare_classpath_for_java_registration($includepatharrayref);
 
-                    if ( $installer::globals::isunix ) { add_jdklib_into_ld_library_path(); }
+                    if ( $installer::globals::isunix )
+                    { add_jdklib_into_ld_library_path($var_library_path); }
                     else { add_jrepath_into_path(); }
 
                     # Preparing a registry which regcomp can work on (types+java services).
@@ -988,6 +999,14 @@ sub create_services_rdb
                 # my $error_during_registration = register_all_components($filesarrayref, $regcompfileref, $servicesfile, $regcomprdb, $includepatharrayref);
                 my $error_during_registration = register_all_components($allvariableshashref, $servicesgid, $unocomponentfiles, $regcompfileref, $servicesfile, $regcomprdb, $includepatharrayref, $nativeservicesurlprefix, $javaservicesurlprefix);
 
+                if (defined $var_library_path) {
+                    if (defined $old_library_path) {
+                        $ENV{$var_library_path} = $old_library_path;
+                    } else {
+                        delete $ENV{$var_library_path};
+                    }
+                }
+
                 # Dependent from the success, the registration directory can be renamed.
 
                 if ( $error_during_registration )
diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm
index 259bdfb3ac82..2ee21c46631e 100644
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -86,11 +86,6 @@ sub register_extensions
 
     my $unopkgfile = $installer::globals::unopkgfile;
 
-    # unset any LIBRARY_PATH variable
-    my $dyld_library_path = delete $ENV{ 'DYLD_LIBRARY_PATH'};
-    my $ld_library_path = delete $ENV{ 'LD_LIBRARY_PATH'};
-    my $library_path = delete $ENV{ 'LIBRARY_PATH'};
-
     # my $extensiondir = $officedir . $installer::globals::separator . "share" .
     #           $installer::globals::separator . "extension" .
     #           $installer::globals::separator . "install";
@@ -164,10 +159,6 @@ sub register_extensions
         push( @installer::globals::logfileinfo, $infoline);
     }
 
-    $ENV{'LIBRARY_PATH'} = $library_path if defined $library_path;
-    $ENV{'LD_LIBRARY_PATH'} = $ld_library_path if defined $ld_library_path;
-    $ENV{'DYLD_LIBRARY_PATH'} = $dyld_library_path if defined $dyld_library_path;
-
     chdir($from);
 }
 
diff --git a/solenv/bin/rpm-wrapper b/solenv/bin/rpm-wrapper
new file mode 100755
index 000000000000..7b0f8767ad5b
--- /dev/null
+++ b/solenv/bin/rpm-wrapper
@@ -0,0 +1,39 @@
+#!/bin/bash
+#*************************************************************************
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile: makefile,v $
+#
+# $Revision: 1.4 $
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#***********************************************************************/
+
+# At least on v20z-so3, when /so/env/bt_linux_libc2.11/DEV300/bin/rpm is called
+# and internally looks for a ld-linux.so.2, it picks up
+# /lib/tls/i686/cmov/ld-linux.so.2 and SIGSEGVs.  This is prevented by
+# adding /so/env/bt_linux_libc2.11/DEV300/lib to the LD_LIBRARY_PATH, thus
+# picking up the ld-linux.so.2 from there:
+
+set -e
+LD_LIBRARY_PATH=${LD_LIBRARY_PATH+${LD_LIBRARY_PATH}:}${COMPATH?}/lib \
+    ${BUILD_TOOLS?}/rpm "$@"
diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini
index a80b092e0a29..db9ad4c3946f 100644
--- a/solenv/config/sdev300.ini
+++ b/solenv/config/sdev300.ini
@@ -210,7 +210,6 @@ finish
 		common_jre:0 IF %JREPATH% ==
 		{
 			HIER set
-			LD_LIBRARY_PATH %LD_LIBRARY_PATH%$:%JDKLIB%
 		}
 		common_jre:1 IF %LD_LIBRARY_PATH% ==
 		{
@@ -650,7 +649,6 @@ unxlngi6
 			DELIVER %PERL% %SOLARENV%/bin/deliver.pl
 			DMAKEROOT %SOLARENV%/inc/startup
 			HAVE_GCC_VISIBILITY_FEATURE TRUE
-			LD_LIBRARY_PATH .:%SOLARVERSION%/%INPATH%/lib%UPDMINOREXT%:%COMPATH%/lib
 			LIBRARY_PATH %SYSBASE%/usr/lib
 			MKOUT %PERL% %SOLARENV%/bin/mkout.pl
 			PATHEXTRA %combin%:/usr/bin:/bin:/usr/sbin:/etc:/usr/bin/X11
@@ -710,7 +708,7 @@ unxlngi6
 			OJDK16PATH %SOLAR_OJDK16PATH%
 			OS LINUX
 			OUTPATH unxlngi6
-			RPM %BUILD_TOOLS%$/rpm
+			RPM %SOLARENV%/bin/rpm-wrapper
 			SOLAR_STLLIBPATH %SOLARVERSION%$/unxlngi6%PROEXT%$/lib%UPDMINOREXT%
 			SOLAR_STLPATH %SOLARVERSION%$/unxlngi6%PROEXT%$/inc%UPDMINOREXT%$/stl
 			SYSBASE %SOLAR_SYSBASE_ROOT%
@@ -725,10 +723,6 @@ unxlngi6
 		{
 			COMPATH %STAR_COMPATH%
 		}
-		debug 
-		{
-			LD_LIBRARY_PATH %SOLARROOT%/solenv/unxlngi4/lib/debug:%LD_LIBRARY_PATH%
-		}
 		distroot:0 if X%DIST_ROOT%X != XX
 		{
 			SHARED_SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
@@ -806,7 +800,6 @@ unxlngi6
 		pre 
 		{
 			ILIB %PRE%/lib:%ILIB%
-			LD_LIBRARY_PATH %PRE%/lib:%LD_LIBRARY_PATH%
 			LIB %PRE%/lib:%LIB%
 			SOLARINC -I. -I%PRE%/inc %SOLARINC%
 			SOLARLIB -L%PRE%/lib %SOLARLIB% -L/usr/X11R6/lib
@@ -847,7 +840,7 @@ unxlngi6
 		SYSBASE_ROOT 
 		USER 
 	}
-	order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk13path:0 jdk14path:0 jdk15path:0 ojdk16path:0 distroot:0 nativecvs ca cap cax compath common2 pro common3:0 stl:0 stl:1 common jdk13 jdk14 jdk15 ojdk16 debug pre
+	order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk13path:0 jdk14path:0 jdk15path:0 ojdk16path:0 distroot:0 nativecvs ca cap cax compath common2 pro common3:0 stl:0 stl:1 common jdk13 jdk14 jdk15 ojdk16 pre
 	reset 
 	{
 		CLASSPATH 
@@ -978,7 +971,6 @@ unxlngx6
 			DELIVER %PERL% %SOLARENV%/bin/deliver.pl
 			DMAKEROOT %SOLARENV%/inc/startup
 			HAVE_GCC_VISIBILITY_FEATURE TRUE
-			LD_LIBRARY_PATH .:%SOLARVERSION%/%INPATH%/lib%UPDMINOREXT%:%COMPATH%/lib
 			LIBRARY_PATH %SYSBASE%/usr/lib
 			MKOUT %PERL% %SOLARENV%/bin/mkout.pl
 			PATHEXTRA %combin%:/usr/bin:/bin:/usr/sbin:/etc:/usr/bin/X11
@@ -1040,7 +1032,7 @@ unxlngx6
 			OS LINUX
 			OUTPATH unxlngx6
 			PA_VER 18
-			RPM %BUILD_TOOLS%$/rpm
+			RPM %SOLARENV%/bin/rpm-wrapper
 			SOLARUPD %UPD%
 			SOLAR_STLLIBPATH %SOLARVERSION%$/unxlngx6%PROEXT%$/lib%UPDMINOREXT%
 			SOLAR_STLPATH %SOLARVERSION%$/unxlngx6%PROEXT%$/inc%UPDMINOREXT%$/stl
@@ -1056,10 +1048,6 @@ unxlngx6
 		{
 			COMPATH %STAR_COMPATH%
 		}
-		debug 
-		{
-			LD_LIBRARY_PATH %SOLARROOT%/solenv/unxlngx4/lib/debug:%LD_LIBRARY_PATH%
-		}
 		distroot:0 if X%DIST_ROOT%X != XX
 		{
 			SHARED_SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
@@ -1122,7 +1110,6 @@ unxlngx6
 		pre 
 		{
 			ILIB %PRE%/lib:%ILIB%
-			LD_LIBRARY_PATH %PRE%/lib:%LD_LIBRARY_PATH%
 			LIB %PRE%/lib:%LIB%
 			SOLARINC -I. -I%PRE%/inc %SOLARINC%
 			SOLARLIB -L%PRE%/lib %SOLARLIB% -L/usr/X11R6/lib
@@ -1163,7 +1150,7 @@ unxlngx6
 		SYSBASE_ROOT 
 		USER 
 	}
-	order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 ojdk16path:0 distroot:0 nativecvs ca cap cax compath common2  common3:0 pro stl:0 stl:1 common jdk14 jdk15 ojdk16 debug pre
+	order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk14path:0 jdk15path:0 ojdk16path:0 distroot:0 nativecvs ca cap cax compath common2  common3:0 pro stl:0 stl:1 common jdk14 jdk15 ojdk16 pre
 	reset 
 	{
 		CLASSPATH 
@@ -1292,7 +1279,6 @@ unxmacxi
 			DELIVER %PERL% %SOLARENV%/bin/deliver.pl
 			DMAKEROOT %SOLARENV%/inc/startup
 			HAVE_GCC_VISIBILITY_FEATURE TRUE
-			LD_LIBRARY_PATH .:%SOLARVERSION%/%INPATH%/lib%UPDMINOREXT%:%COMPATH%/lib
 			LIBRARY_PATH %SYSBASE%/usr/lib
 			MKOUT %PERL% %SOLARENV%/bin/mkout.pl
 			NO_HIDS TRUE
@@ -1360,7 +1346,6 @@ unxmacxi
 			CPU I
 			CPUNAME INTEL
 			CVER C341
-			DYLD_LIBRARY_PATH .:%SOLARVERSION%$/unxmacxi%PROEXT%$/lib%UPDMINOREXT%
 			ENV_TOOLS %SOLARROOT%/et_macosx_intel/%WORK_STAMP%/bin
 			GLIBC unknown
 			GUI UNX
@@ -1384,10 +1369,6 @@ unxmacxi
 		{
 			COMPATH %STAR_COMPATH%
 		}
-		debug 
-		{
-			LD_LIBRARY_PATH %SOLARROOT%/solenv/unxlngi4/lib/debug:%LD_LIBRARY_PATH%
-		}
 		distroot:0 if X%DIST_ROOT%X != XX
 		{
 			SHARED_SOLARVERSION %DIST_ROOT%/%WORK_STAMP%
@@ -1450,7 +1431,6 @@ unxmacxi
 		pre 
 		{
 			ILIB %PRE%/lib:%ILIB%
-			LD_LIBRARY_PATH %PRE%/lib:%LD_LIBRARY_PATH%
 			LIB %PRE%/lib:%LIB%
 			SOLARINC -I. -I%PRE%/inc %SOLARINC%
 			SOLARLIB -L%PRE%/lib %SOLARLIB% -L/usr/X11R6/lib
@@ -1491,7 +1471,7 @@ unxmacxi
 		SYSBASE_ROOT 
 		USER 
 	}
-	order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk13path:0 jdk14path:0 jdk15path:0 distroot:0 nativecvs ca cap cax compath common2 pro stl:0 stl:1 common jdk13 jdk14 jdk15 debug pre
+	order common0 bs_sourceroot envroot:0 sourceroot:0 sysbaseroot common1 jdk13path:0 jdk14path:0 jdk15path:0 distroot:0 nativecvs ca cap cax compath common2 pro stl:0 stl:1 common jdk13 jdk14 jdk15 pre
 	reset 
 	{
 		CLASSPATH 
@@ -1619,7 +1599,6 @@ unxsoli4
 			COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
 			DELIVER %PERL% %SOLARENV%/bin/deliver.pl
 			DMAKEROOT %SOLARENV%/inc/startup
-			LD_LIBRARY_PATH .:/usr/dt/lib:/usr/openwin/lib:%SOLARVERSION%/%INPATH%/lib%UPDMINOREXT%
 			MKOUT %PERL% %SOLARENV%/bin/mkout.pl
 			PATHEXTRA /usr/ccs/bin:/usr/bin:/bin:/usr/sbin:/etc:/usr/bin/X11:/opt/langtools/bin:/usr/dt/bin
 			SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include
@@ -1762,7 +1741,6 @@ unxsoli4
 		pre 
 		{
 			ILIB %PRE%/lib:%ILIB%
-			LD_LIBRARY_PATH %PRE%/lib:%LD_LIBRARY_PATH%
 			SOLARINC -I. -I%PRE%/inc %SOLARINC%
 			SOLARLIB -L%PRE%/lib %SOLARLIB%
 		}
@@ -1926,7 +1904,6 @@ unxsols4
 			COPYPRJ %PERL% %COMMON_ENV_TOOLS%/copyprj.pl
 			DELIVER %PERL% %SOLARENV%/bin/deliver.pl
 			DMAKEROOT %SOLARENV%/inc/startup
-			LD_LIBRARY_PATH .:/usr/dt/lib:/usr/openwin/lib:%SOLARVERSION%/%INPATH%/lib%UPDMINOREXT%
 			MKOUT %PERL% %SOLARENV%/bin/mkout.pl
 			PATHEXTRA /usr/ccs/bin:/usr/bin:/bin:/usr/sbin:/etc:/usr/bin/X11:/opt/langtools/bin:/usr/dt/bin
 			SOLAREXTRAINC -I%SOLAR_STLPATH% -I%SYSBASE%/usr/include
@@ -2076,7 +2053,6 @@ unxsols4
 		pre 
 		{
 			ILIB %PRE%/lib:%ILIB%
-			LD_LIBRARY_PATH %PRE%/lib:%LD_LIBRARY_PATH%
 			SOLARINC -I. -I%PRE%/inc %SOLARINC%
 			SOLARLIB -L%PRE%/lib %SOLARLIB%
 		}
@@ -2244,7 +2220,6 @@ unxsolu4
 			ENABLE_GNOMEVFS 
 			FREETYPE_CFLAGS -I%SYSBASE%/usr/sfw/include -I%SYSBASE%/usr/sfw/include/freetype2
 			FREETYPE_LIBS -L%SYSBASE%/usr/sfw/lib/sparcv9 -lfreetype
-			LD_LIBRARY_PATH .:/usr/dt/lib:/usr/openwin/lib:%SOLARVERSION%/%INPATH%/lib%UPDMINOREXT%
 			LIBXML_CFLAGS -I%SYSBASE%/usr/include/libxml2
 			LIBXML_LIBS -L%SYSBASE%/usr/lib/sparcv9 -lxml2 -lpthread -lz -lm -lsocket -lnsl
 			LIBXSLT_CFLAGS -I%SYSBASE%/usr/include/libxml2
@@ -2348,7 +2323,6 @@ unxsolu4
 		pre 
 		{
 			ILIB %PRE%/lib:%ILIB%
-			LD_LIBRARY_PATH %PRE%/lib:%LD_LIBRARY_PATH%
 			SOLARINC -I. -I%PRE%/inc %SOLARINC%
 			SOLARLIB -L%PRE%/lib %SOLARLIB%
 		}
diff --git a/solenv/config/ssolar.cmn b/solenv/config/ssolar.cmn
index 793fd2b7f24b..c304db1cdb6c 100644
--- a/solenv/config/ssolar.cmn
+++ b/solenv/config/ssolar.cmn
@@ -66,7 +66,6 @@ common
 		DELIVER
 		DIC_ALL
 		DPKG
-		DYLD_LIBRARY_PATH
 		DMAKE_INC
 		DMAKE
 		DRIVE_O
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index 75fa38eb8f78..ded3a5732375 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -940,7 +940,7 @@ MKDEPFLAGS+=$(MKDEPLOCAL)
 BISON=bison
 YACCFLAGS*=-d 
 
-SVIDL=svidl
+SVIDL=$(AUGMENT_LIBRARY_PATH) svidl
 
 LDUMP=ldump4
 LDUMP2=ldump4
@@ -957,9 +957,9 @@ SCPLINKFLAGS+=-v $(SCPLINKVERSION)
 .ENDIF			# "$(SCPLINKVERSION)"!=""
 
 .IF "$(make_srs_deps)"!=""
-RSC=rscdep
+RSC=$(AUGMENT_LIBRARY_PATH) rscdep
 .ELSE # "$(make_srs_deps)"!=""
-RSC=$(FLIPCMD) rsc
+RSC=$(AUGMENT_LIBRARY_PATH) $(FLIPCMD) rsc
 .ENDIF # "$(make_srs_deps)"!=""
 
 #new
@@ -1023,13 +1023,13 @@ MAXPROCESS!:=1
 # allow seperate handling
 EXTMAXPROCESS*=$(MAXPROCESS)
 
-IDLC*=idlc
-REGMERGE*=regmerge
-REGCOMPARE*=regcompare
-REGCOMP*=regcomp
-CPPUMAKER*=cppumaker
-JAVAMAKER*=javamaker
-RDBMAKER*=rdbmaker
+IDLC*=$(AUGMENT_LIBRARY_PATH) idlc
+REGMERGE*=$(AUGMENT_LIBRARY_PATH) regmerge
+REGCOMPARE*=$(AUGMENT_LIBRARY_PATH) regcompare
+REGCOMP*=$(AUGMENT_LIBRARY_PATH) regcomp
+CPPUMAKER*=$(AUGMENT_LIBRARY_PATH) cppumaker
+JAVAMAKER*=$(AUGMENT_LIBRARY_PATH) javamaker
+RDBMAKER*=$(AUGMENT_LIBRARY_PATH) rdbmaker
 .IF "$(JAVAINTERPRETER)" == ""
 JAVA*:=java
 .ELSE
@@ -1281,47 +1281,47 @@ TRUSTED_MANIFEST_LOCATION*=$(SOLARENV)$/inc
 
 .IF "$(COMP1TYPELIST)"!=""
 .INCLUDE .IGNORE : $(MISC)$/$(COMP1TYPELIST).mk
-$(COMP1TYPELIST)_XML2CMPTYPES:=$(shell @xml2cmp -types stdout $(MISC)$/$(COMP1TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
+$(COMP1TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) xml2cmp -types stdout $(MISC)$/$(COMP1TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
 .ENDIF
 
 .IF "$(COMP2TYPELIST)"!=""
 .INCLUDE .IGNORE : $(MISC)$/$(COMP2TYPELIST).mk
-$(COMP2TYPELIST)_XML2CMPTYPES:=$(shell @xml2cmp -types stdout $(MISC)$/$(COMP2TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
+$(COMP2TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) xml2cmp -types stdout $(MISC)$/$(COMP2TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
 .ENDIF
 
 .IF "$(COMP3TYPELIST)"!=""
 .INCLUDE .IGNORE : $(MISC)$/$(COMP3TYPELIST).mk
-$(COMP3TYPELIST)_XML2CMPTYPES:=$(shell @xml2cmp -types stdout $(MISC)$/$(COMP3TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
+$(COMP3TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) xml2cmp -types stdout $(MISC)$/$(COMP3TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
 .ENDIF
 
 .IF "$(COMP4TYPELIST)"!=""
 .INCLUDE .IGNORE : $(MISC)$/$(COMP4TYPELIST).mk
-$(COMP4TYPELIST)_XML2CMPTYPES:=$(shell @xml2cmp -types stdout $(MISC)$/$(COMP4TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
+$(COMP4TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) xml2cmp -types stdout $(MISC)$/$(COMP4TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
 .ENDIF
 
 .IF "$(COMP5TYPELIST)"!=""
 .INCLUDE .IGNORE : $(MISC)$/$(COMP5TYPELIST).mk
-$(COMP5TYPELIST)_XML2CMPTYPES:=$(shell @xml2cmp -types stdout $(MISC)$/$(COMP5TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
+$(COMP5TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) xml2cmp -types stdout $(MISC)$/$(COMP5TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
 .ENDIF
 
 .IF "$(COMP6TYPELIST)"!=""
 .INCLUDE .IGNORE : $(MISC)$/$(COMP6TYPELIST).mk
-$(COMP6TYPELIST)_XML2CMPTYPES:=$(shell @xml2cmp -types stdout $(MISC)$/$(COMP6TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
+$(COMP6TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) xml2cmp -types stdout $(MISC)$/$(COMP6TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
 .ENDIF
 
 .IF "$(COMP7TYPELIST)"!=""
 .INCLUDE .IGNORE : $(MISC)$/$(COMP7TYPELIST).mk
-$(COMP7TYPELIST)_XML2CMPTYPES:=$(shell @xml2cmp -types stdout $(MISC)$/$(COMP7TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
+$(COMP7TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) xml2cmp -types stdout $(MISC)$/$(COMP7TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
 .ENDIF
 
 .IF "$(COMP8TYPELIST)"!=""
 .INCLUDE .IGNORE : $(MISC)$/$(COMP8TYPELIST).mk
-$(COMP8TYPELIST)_XML2CMPTYPES:=$(shell @xml2cmp -types stdout $(MISC)$/$(COMP8TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
+$(COMP8TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) xml2cmp -types stdout $(MISC)$/$(COMP8TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
 .ENDIF
 
 .IF "$(COMP9TYPELIST)"!=""
 .INCLUDE .IGNORE : $(MISC)$/$(COMP9TYPELIST).mk
-$(COMP9TYPELIST)_XML2CMPTYPES:=$(shell @xml2cmp -types stdout $(MISC)$/$(COMP9TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
+$(COMP9TYPELIST)_XML2CMPTYPES:=$(shell @$(AUGMENT_LIBRARY_PATH) xml2cmp -types stdout $(MISC)$/$(COMP9TYPELIST)$($(WINVERSIONNAMES)_MAJOR).xml)
 .ENDIF
 
 # some place to define these jars for SO environment
diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk
index 6a1f72525852..4912da41a026 100644
--- a/solenv/inc/target.mk
+++ b/solenv/inc/target.mk
@@ -1524,7 +1524,7 @@ $(MISC)$/$(TARGET)_%.done : $(COMMONMISC)$/$(TARGET)$/%.xrb
 $(MISC)$/$(TARGET)_%.done : %.xrb
 .ENDIF			# "$(WITH_LANG)"!=""
     @@-$(RM) $(MISC)$/$(<:b).interm$(TARGET)
-    native2ascii -encoding UTF8 $< $(MISC)$/$(<:b).interm$(TARGET) && xmlex -i $(MISC)$/$(<:b).interm$(TARGET) -o $(CLASSDIR) $(XML_ISO_CODE) -g -d $@
+    native2ascii -encoding UTF8 $< $(MISC)$/$(<:b).interm$(TARGET) && $(XMLEX) -i $(MISC)$/$(<:b).interm$(TARGET) -o $(CLASSDIR) $(XML_ISO_CODE) -g -d $@
     @@$(RM)  $(MISC)$/$(<:b).interm$(TARGET)
 .ENDIF			# "$(XMLPROPERTIES)"!=""
 
diff --git a/solenv/inc/unitools.mk b/solenv/inc/unitools.mk
index d197592d1d69..e16ed48b0cae 100644
--- a/solenv/inc/unitools.mk
+++ b/solenv/inc/unitools.mk
@@ -31,15 +31,15 @@
 
 # Common tools - move this to the end / consolidate
 TRANSEX*=transex3
-ULFEX*=ulfex
-XMLEX*=xmlex
-XRMEX*=xrmex
+ULFEX*=$(AUGMENT_LIBRARY_PATH) ulfex
+XMLEX*=$(AUGMENT_LIBRARY_PATH) xmlex
+XRMEX*=$(AUGMENT_LIBRARY_PATH) xrmex
 CFGEX*=cfgex
 XSLTPROC*=xsltproc
 
-ULFCONV*=ulfconv
+ULFCONV*=$(AUGMENT_LIBRARY_PATH) ulfconv
 
-MAKEDEPEND*=$(SOLARBINDIR)$/makedepend
+MAKEDEPEND*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)$/makedepend
 
 SCP_CHECK_TOOL:=checkscp$E
 
@@ -128,11 +128,6 @@ PERL*:=perl
 RENAME*=mv
 TOUCH*=touch
 TYPE*=cat
-TRANSEX*=transex3
-ULFEX*=ulfex
-XMLEX*=xmlex
-XRMEX*=xrmex
-CFGEX*=cfgex
 .ELSE			# "$(USE_SHELL)"!="4nt"
 CDD=+cdd
 COPY*=+copy
@@ -227,7 +222,7 @@ RMDIR*=rmdir
 XARGS*=xargs
 
 RM+=$(RMFLAGS)
-ADJUSTVISIBILITY*:=adjustvisibility
+ADJUSTVISIBILITY*=$(AUGMENT_LIBRARY_PATH) adjustvisibility
 CONVERT*:=$(PERL) $(SOLARENV)$/bin$/leconvert.pl
 EXECTEST := $(PERL) -w $(SOLARENV)$/bin$/exectest.pl
 GCCINSTLIB:=$(PERL) -w $(SOLARENV)$/bin$/gccinstlib.pl
diff --git a/solenv/inc/unx.mk b/solenv/inc/unx.mk
index 40446be39e25..616284b855d9 100644
--- a/solenv/inc/unx.mk
+++ b/solenv/inc/unx.mk
@@ -233,3 +233,18 @@ KDE_LIBS:=-lkdeui -lkdecore -lqt-mt
 SOLARLIB+=-L$(KDE_ROOT)$/lib
 .ENDIF          # "$(KDE_ROOT)"!=""
 .ENDIF          # "$(ENABLE_KDE)" != ""
+
+# Add SOLARLIBDIR to the end of a (potentially previously undefined)
+# LD_LIBRARY_PATH (there is no real reason to prefer adding at the end over
+# adding at the start); the ": &&" in the bash case enables this to work at the
+# start of a recipe line that is not prefixed by "+" as well as in the middle of
+# an existing && chain; the tcsh case is somewhat imprecise in that it
+# potentially affects multiple commands following on the recipe line:
+.IF "$(USE_SHELL)" == "bash"
+AUGMENT_LIBRARY_PATH *= : && \
+    LD_LIBRARY_PATH=$${{LD_LIBRARY_PATH+$${{LD_LIBRARY_PATH}}:}}$(SOLARLIBDIR)
+.ELSE
+AUGMENT_LIBRARY_PATH *= if ($$?LD_LIBRARY_PATH == 1) \
+    eval 'setenv LD_LIBRARY_PATH "$${{LD_LIBRARY_PATH}}:$(SOLARLIBDIR)"' && \
+    if ($$?LD_LIBRARY_PATH == 0) setenv LD_LIBRARY_PATH "$(SOLARLIBDIR)" &&
+.ENDIF
diff --git a/solenv/inc/unxmacx.mk b/solenv/inc/unxmacx.mk
index 575372caba1b..ff8901ac126b 100644
--- a/solenv/inc/unxmacx.mk
+++ b/solenv/inc/unxmacx.mk
@@ -282,3 +282,19 @@ RCFLAGS=-fo$@ $(RCFILES)
 RCLINK=
 RCLINKFLAGS=
 RCSETVERSION=
+
+# Add SOLARLIBDIR to the end of a (potentially previously undefined)
+# DYLD_LIBRARY_PATH (there is no real reason to prefer adding at the end over
+# adding at the start); the ": &&" in the bash case enables this to work at the
+# start of a recipe line that is not prefixed by "+" as well as in the middle of
+# an existing && chain; the tcsh case is somewhat imprecise in that it
+# potentially affects multiple commands following on the recipe line:
+.IF "$(USE_SHELL)" == "bash"
+AUGMENT_LIBRARY_PATH = : && \
+    DYLD_LIBRARY_PATH=$${{DYLD_LIBRARY_PATH+$${{DYLD_LIBRARY_PATH}}:}}$(SOLARLIBDIR)
+.ELSE
+AUGMENT_LIBRARY_PATH = if ($$?DYLD_LIBRARY_PATH == 1) \
+    eval 'setenv DYLD_LIBRARY_PATH "$${{DYLD_LIBRARY_PATH}}:$(SOLARLIBDIR)"' \
+    && if ($$?DYLD_LIBRARY_PATH == 0) \
+    setenv DYLD_LIBRARY_PATH "$(SOLARLIBDIR)" &&
+.ENDIF
diff --git a/soltools/adjustvisibility/makefile.mk b/soltools/adjustvisibility/makefile.mk
index d2529c8ddf14..a4963b2eb071 100644
--- a/soltools/adjustvisibility/makefile.mk
+++ b/soltools/adjustvisibility/makefile.mk
@@ -51,6 +51,7 @@ APP1TARGET	= 	adjustvisibility
 APP1OBJS	=	$(OBJ)$/adjustvisibility.obj
 DEPOBJFILES	=	$(APP1OBJ)
 APP1STDLIBS =   -lelf
+APP1RPATH   =   NONE
 
 .ENDIF "$(OS)"=="SOLARIS"
 
diff --git a/soltools/mkdepend/makefile.mk b/soltools/mkdepend/makefile.mk
index a7a85ee3c788..ca6f57ef1c7b 100644
--- a/soltools/mkdepend/makefile.mk
+++ b/soltools/mkdepend/makefile.mk
@@ -63,7 +63,7 @@ OBJFILES=  \
 
 APP1TARGET=makedepend
 APP1OBJS=$(OBJFILES)
-
+APP1RPATH=NONE
 
 .INCLUDE : target.mk
 
diff --git a/soltools/util/makefile.pmk b/soltools/util/makefile.pmk
index 43d44f08648b..b0a67f85e06a 100644
--- a/soltools/util/makefile.pmk
+++ b/soltools/util/makefile.pmk
@@ -30,7 +30,7 @@
 #*************************************************************************
 
 # find 'makedepend' in own output tree
-MAKEDEPEND=$(WRAPCMD) $(BIN)$/makedepend
+MAKEDEPEND=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(BIN)$/makedepend
 
 # find 'adjustvisibility' in own output tree
-ADJUSTVISIBILITY=$(WRAPCMD) $(BIN)$/adjustvisibility
+ADJUSTVISIBILITY=$(AUGMENT_LIBRARY_PATH) $(WRAPCMD) $(BIN)$/adjustvisibility