INTEGRATION: CWS sb71 (1.38.6); FILE MERGED

2007/10/02 09:47:53 sb 1.38.6.6: RESYNC: (1.42-1.44); FILE MERGED
2007/08/23 17:50:46 sb 1.38.6.5: RESYNC: (1.41-1.42); FILE MERGED
2007/06/15 08:13:08 sb 1.38.6.4: RESYNC: (1.39-1.41); FILE MERGED
2007/06/14 15:09:32 sb 1.38.6.3: #i75466# Replaced LINKFLAGSRUNPATH with more flexible APP|SHLnRPATH.
2007/05/30 14:08:12 sb 1.38.6.2: RESYNC: (1.38-1.39); FILE MERGED
2007/04/13 14:53:13 sb 1.38.6.1: #i75466# Added ure-link/lib to the general LINKFLAGSRUNPATH (in cases to which this does not pertain the bogus additional path is harmless, but still should be cleaned away).

solenv/inc/unxsols4.mk

@@ -4,9 +4,9 @@
 #
 #   $RCSfile: unxsols4.mk,v $
 #
-#   $Revision: 1.44 $
+#   $Revision: 1.45 $
 #
-#   last change: $Author: hr $ $Date: 2007-09-27 07:49:42 $
+#   last change: $Author: vg $ $Date: 2007-10-15 12:42:02 $
 #
 #   The Contents of this file are made available subject to
 #   the terms of GNU Lesser General Public License Version 2.1.
@@ -137,9 +137,12 @@ CFLAGSCC+=$(C_RESTRICTIONFLAGS)
 
 # -z combreloc combines multiple relocation sections. Reduces overhead on startup
 # -norunpath prevents the compiler from recording his own libs in the runpath
-LINKFLAGSRUNPATH*=-R\''$$ORIGIN'\'
-LINKFLAGS=-w -mt -z combreloc -PIC -temp=/tmp $(LINKFLAGSRUNPATH) -norunpath -library=no%Cstd
-LINKCFLAGS=-w -mt -z combreloc $(LINKFLAGSRUNPATH) -norunpath
+LINKFLAGSRUNPATH_URELIB=-R\''$$ORIGIN'\'
+LINKFLAGSRUNPATH_UREBIN=-R\''$$ORIGIN/../lib:$$ORIGIN'\'
+    #TODO: drop $ORIGIN once no URE executable is also shipped in OOo
+LINKFLAGSRUNPATH_OOO=-R\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
+LINKFLAGS=-w -mt -z combreloc -PIC -temp=/tmp -norunpath -library=no%Cstd
+LINKCFLAGS=-w -mt -z combreloc -norunpath
 
 # -z text force fatal error if non PIC code is linked into shared library. Such code
 #    would be expensive on startup