diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-01-29 15:24:08 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-01-29 15:24:08 +0000 |
| commit | 65d6a0f34518353d085bbf4e36de1e016e969790 (patch) | |
| tree | ac44953d164c3283809e6a90e0daa4b8d8c5fa02 /vcl/util | |
| parent | 35b0b3e6e3dc53b78367e4349fd6f73d185034d4 (diff) | |
INTEGRATION: CWS vcl85_SRC680 (1.2.136); FILE MERGED
2008/01/09 08:53:13 sb 1.2.136.1: #i85099# Fix silent merge conflict from CWS sb71 and CWS mergesvp.
Diffstat (limited to 'vcl/util')
| -rw-r--r-- | vcl/util/linksvp/makefile.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vcl/util/linksvp/makefile.mk b/vcl/util/linksvp/makefile.mk index 0cc91b962dcf..d2371c5b158e 100644 --- a/vcl/util/linksvp/makefile.mk +++ b/vcl/util/linksvp/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.3 $ # -# last change: $Author: rt $ $Date: 2007-07-24 10:33:09 $ +# last change: $Author: rt $ $Date: 2008-01-29 16:24:08 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -39,14 +39,14 @@ PRJNAME=vcl TARGET=svp TARGETTYPE=CUI -.IF "$(OS)" == "SOLARIS" -LINKFLAGSRUNPATH=-R/usr/sfw/lib -R\''$$ORIGIN'\' -.ENDIF - # --- Settings ----------------------------------------------------------- .INCLUDE : settings.mk +.IF "$(OS)" == "SOLARIS" +LINKFLAGSRUNPATH_OOO := -R/usr/sfw/lib $(LINKFLAGSRUNPATH_OOO) +.ENDIF + .IF "$(GUIBASE)" == "unx" # headless plugin LIB1TARGET=$(SLB)$/isvpplug |