From 1245039764a356ebe4ad8b8e6c5d73796b0acd11 Mon Sep 17 00:00:00 2001
From: Oliver Bolte <obo@openoffice.org>
Date: Fri, 17 Jun 2005 09:16:38 +0000
Subject: INTEGRATION: CWS sb31 (1.5.20); FILE MERGED 2005/05/04 14:46:51 sb
 1.5.20.2: #121392# Fixed platform-dependency of previous fix. 2005/04/22
 15:06:34 sb 1.5.20.1: #121392# Change RPATH of regcomp executable so that it
 is functional within a URE.

---
 registry/tools/makefile.mk | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'registry')

diff --git a/registry/tools/makefile.mk b/registry/tools/makefile.mk
index d24781019..69c4318cf 100644
--- a/registry/tools/makefile.mk
+++ b/registry/tools/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.5 $
+#   $Revision: 1.6 $
 #
-#   last change: $Author: obo $ $Date: 2004-06-04 02:46:20 $
+#   last change: $Author: obo $ $Date: 2005-06-17 10:16:38 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -69,6 +69,12 @@ LIBTARGET=NO
 
 ENABLE_EXCEPTIONS := TRUE
 
+.IF "$(OS)" == "LINUX"
+LINKFLAGSRUNPATH = -Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\'
+.ELIF "$(OS)" == "SOLARIS"
+LINKFLAGSRUNPATH = -R\''$$ORIGIN/../lib:$$ORIGIN'\'
+.ENDIF
+
 # --- Settings -----------------------------------------------------
 .INCLUDE :  svpre.mk
 .INCLUDE :  settings.mk
-- 
cgit v1.2.3