diff options
author | Oliver Bolte <obo@openoffice.org> | 2005-07-18 13:10:12 +0000 |
---|---|---|
committer | Oliver Bolte <obo@openoffice.org> | 2005-07-18 13:10:12 +0000 |
commit | 9c66f60f160fa8ba40116612551e85fc8f41e398 (patch) | |
tree | b4b030b214e82567d7ea92d67cc8d6ccbc3acd0a /vcl | |
parent | f7e4de0b4803e62c63521031e44c46c9d31a4b90 (diff) |
INTEGRATION: CWS sysui09 (1.69.50); FILE MERGED
2005/07/14 09:12:25 obr 1.69.50.2: #b6243141#,#b6294657# switched run patch to include /usr/sfw/lib first
2005/07/12 11:53:36 obr 1.69.50.1: #b6294657# Solaris has libfreetype.so.6 in /usr/sfw/lib
Diffstat (limited to 'vcl')
-rw-r--r-- | vcl/util/makefile.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/vcl/util/makefile.mk b/vcl/util/makefile.mk index e635a92da748..ecfa51142837 100644 --- a/vcl/util/makefile.mk +++ b/vcl/util/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.70 $ +# $Revision: 1.71 $ # -# last change: $Author: kz $ $Date: 2005-07-15 09:36:04 $ +# last change: $Author: obo $ $Date: 2005-07-18 14:10:12 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -67,6 +67,10 @@ TARGET=vcl VERSION=$(UPD) USE_DEFFILE=TRUE +.IF "$(OS)" == "SOLARIS" +LINKFLAGSRUNPATH=-R/usr/sfw/lib -R\''$$ORIGIN'\' +.ENDIF + # --- Settings ----------------------------------------------------------- .INCLUDE : settings.mk |