INTEGRATION: CWS sb71 (1.32.16); FILE MERGED

2007/10/02 09:47:38 sb 1.32.16.6: RESYNC: (1.39-1.40); FILE MERGED
2007/08/23 17:49:32 sb 1.32.16.5: RESYNC: (1.36-1.39); FILE MERGED
2007/06/15 08:12:53 sb 1.32.16.4: RESYNC: (1.34-1.36); FILE MERGED
2007/06/14 15:09:32 sb 1.32.16.3: #i75466# Replaced LINKFLAGSRUNPATH with more flexible APP|SHLnRPATH.
2007/05/30 14:07:29 sb 1.32.16.2: RESYNC: (1.32-1.34); FILE MERGED
2007/04/13 14:53:12 sb 1.32.16.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/unxlngi6.mk

@@ -4,9 +4,9 @@
 #
 #   $RCSfile: unxlngi6.mk,v $
 #
-#   $Revision: 1.40 $
+#   $Revision: 1.41 $
 #
-#   last change: $Author: hr $ $Date: 2007-09-27 07:49:16 $
+#   last change: $Author: vg $ $Date: 2007-10-15 12:41:01 $
 #
 #   The Contents of this file are made available subject to
 #   the terms of GNU Lesser General Public License Version 2.1.
@@ -152,9 +152,12 @@ LINKC*=$(CC)
 
 # default linker flags
 LINKFLAGSDEFS*=-Wl,-z,defs
-LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
+LINKFLAGSRUNPATH_URELIB=-Wl,-rpath,\''$$ORIGIN'\'
+LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\'
+    #TODO: drop $ORIGIN once no URE executable is also shipped in OOo
+LINKFLAGSRUNPATH_OOO=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
 # flag -Wl,-z,noexecstack sets the NX bit on the stack
-LINKFLAGS=-Wl,-z,noexecstack -Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
+LINKFLAGS=-Wl,-z,noexecstack -Wl,-z,combreloc $(LINKFLAGSDEFS)
 
 # linker flags for linking applications
 LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec