diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-12-21 10:10:45 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-12-21 10:10:45 +0000 |
| commit | eb4ca355f76950c34604d983b268fb19786b8ab3 (patch) | |
| tree | 9059868f3d59ece85c6ab82181b319fb77689659 /berkeleydb/makefile.mk | |
| parent | INTEGRATION: CWS pj41 (1.6.2); FILE MERGED (diff) | |
| download | core-eb4ca355f76950c34604d983b268fb19786b8ab3.tar.gz core-eb4ca355f76950c34604d983b268fb19786b8ab3.zip | |
INTEGRATION: CWS cmcfixes21 (1.24.2); FILE MERGED
2005/11/10 16:14:58 cmc 1.24.2.1: #i51718# propogate rpath of ORIGIN to externals
Diffstat (limited to 'berkeleydb/makefile.mk')
| -rw-r--r-- | berkeleydb/makefile.mk | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/berkeleydb/makefile.mk b/berkeleydb/makefile.mk index e4a6457f50b8..aa084f176d7a 100644 --- a/berkeleydb/makefile.mk +++ b/berkeleydb/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.24 $ +# $Revision: 1.25 $ # -# last change: $Author: kz $ $Date: 2005-11-03 11:56:47 $ +# last change: $Author: obo $ $Date: 2005-12-21 11:10:45 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -66,6 +66,13 @@ ADDITIONAL_FILES= \ PATCH_FILE_NAME=db-4.2.52.patch .IF "$(GUI)"=="UNX" +.IF "$(OS)$(COM)"=="LINUXGCC" +LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN' +.ENDIF # "$(OS)$(COM)"=="LINUXGCC" +.IF "$(OS)$(COM)"=="SOLARISC52" +LDFLAGS:=-Wl,-R'$$$$ORIGIN' +.ENDIF # "$(OS)$(COM)"=="SOLARISC52" +.EXPORT: LDFLAGS CONFIGURE_DIR=out #relative to CONFIGURE_DIR CONFIGURE_ACTION= \ |