diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-06-17 09:07:55 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-06-17 09:07:55 +0000 |
| commit | 2c9df7dfa8180214537fb3426c996ff2157e0539 (patch) | |
| tree | a6512fe06ebec162d7b89fe5d30ff155e6833766 /cpputools | |
| parent | 211bee536d1abae52de3ec2e1f419eb021075aae (diff) | |
INTEGRATION: CWS sb31 (1.12.4); FILE MERGED
2005/05/04 14:55:03 sb 1.12.4.2: #121392# Fixed platform-dependency of previous fix.
2005/04/22 15:00:56 sb 1.12.4.1: #121392# Change RPATH of regcomp executable so that it is functional within a URE.
Diffstat (limited to 'cpputools')
| -rw-r--r-- | cpputools/source/registercomponent/makefile.mk | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/cpputools/source/registercomponent/makefile.mk b/cpputools/source/registercomponent/makefile.mk index e56b391f30b5..5bd0344320a1 100644 --- a/cpputools/source/registercomponent/makefile.mk +++ b/cpputools/source/registercomponent/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.12 $ +# $Revision: 1.13 $ # -# last change: $Author: rt $ $Date: 2004-11-29 13:14:36 $ +# last change: $Author: obo $ $Date: 2005-06-17 10:07:55 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -67,6 +67,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 : settings.mk |