INTEGRATION: CWS sb71 (1.3.6); FILE MERGED

2007/07/18 12:00:23 sb 1.3.6.2: RESYNC: (1.3-1.4); FILE MERGED
2007/06/14 15:09:32 sb 1.3.6.1: #i75466# Replaced LINKFLAGSRUNPATH with more flexible APP|SHLnRPATH.

solenv/inc/unxfbsd.mk

@@ -4,9 +4,9 @@
 #
 #   $RCSfile: unxfbsd.mk,v $
 #
-#   $Revision: 1.4 $
+#   $Revision: 1.5 $
 #
-#   last change: $Author: rt $ $Date: 2007-07-05 08:56:05 $
+#   last change: $Author: vg $ $Date: 2007-10-15 12:40:17 $
 #
 #   The Contents of this file are made available subject to
 #   the terms of GNU Lesser General Public License Version 2.1.
@@ -145,8 +145,11 @@ LINKC*=$(CC)
 
 # default linker flags
 LINKFLAGSDEFS*=#-Wl,-z,defs
-LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
-LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
+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'\'
+LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS)
 
 # linker flags for linking applications
 LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec