From e1c192d9fd8f77a1504e06e61735e68caa442edc Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Mon, 15 Oct 2007 11:39:26 +0000 Subject: INTEGRATION: CWS sb71 (1.214.26); FILE MERGED 2007/08/23 17:48:15 sb 1.214.26.4: RESYNC: (1.218-1.219); FILE MERGED 2007/07/18 11:58:58 sb 1.214.26.3: RESYNC: (1.215-1.218); FILE MERGED 2007/06/15 08:12:08 sb 1.214.26.2: RESYNC: (1.214-1.215); FILE MERGED 2007/06/14 15:09:32 sb 1.214.26.1: #i75466# Replaced LINKFLAGSRUNPATH with more flexible APP|SHLnRPATH. --- solenv/inc/settings.mk | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'solenv/inc/settings.mk') diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 74deb15fd7f8..4c9d8bfe2a3c 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -4,9 +4,9 @@ # # $RCSfile: settings.mk,v $ # -# $Revision: 1.219 $ +# $Revision: 1.220 $ # -# last change: $Author: rt $ $Date: 2007-07-24 13:31:15 $ +# last change: $Author: vg $ $Date: 2007-10-15 12:39:26 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -1204,6 +1204,10 @@ RSCDEFS+= $(ENVRSCDEFS) RCFLAGS+= $(ENVRCFLAGS) RCLINKFLAGS+= $(ENVRCLINKFLAGS) +LINKFLAGSRUNPATH_URELIB*= +LINKFLAGSRUNPATH_UREBIN*= +LINKFLAGSRUNPATH_OOO*= + # make sure both linker variables are set LINKC*=$(LINK) LINKCFLAGS*=$(LINKFLAGS) -- cgit