diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 12:07:51 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 12:07:51 +0000 |
| commit | 57c1b33aaef6d16d7b0b73b6662549fd8a8c5e02 (patch) | |
| tree | 66bce96bea8ad36b14595f0158a31601807dbe78 /vcl | |
| parent | a6830751337a8e5d2a68b4540fec9fe1ab04ef2a (diff) | |
INTEGRATION: CWS sb71 (1.87.6); FILE MERGED
2007/10/02 11:02:49 sb 1.87.6.7: RESYNC: (1.98-1.99); FILE MERGED
2007/08/23 19:04:18 sb 1.87.6.6: RESYNC: (1.94-1.98); FILE MERGED
2007/07/18 14:17:36 sb 1.87.6.5: RESYNC: (1.92-1.94); FILE MERGED
2007/06/15 08:38:58 sb 1.87.6.4: RESYNC: (1.89-1.92); FILE MERGED
2007/06/14 15:02:45 sb 1.87.6.3: #i75466# Adapted to new APP|SHLnRPATH.
2007/04/16 16:28:03 sb 1.87.6.2: RESYNC: (1.87-1.89); FILE MERGED
2007/04/13 14:55:46 sb 1.87.6.1: #i75466# Do not assume that the preset LINKFLAGSRUNPATH is exactly .
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/util/makefile.mk | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/vcl/util/makefile.mk b/vcl/util/makefile.mk index 148d3dfca604..3e3f69acd7ea 100644 --- a/vcl/util/makefile.mk +++ b/vcl/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.99 $ +# $Revision: 1.100 $ # -# last change: $Author: vg $ $Date: 2007-09-20 16:25:28 $ +# last change: $Author: vg $ $Date: 2007-10-15 13:07:51 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -41,10 +41,6 @@ TARGETTYPE=GUI VERSION=$(UPD) USE_DEFFILE=TRUE -.IF "$(OS)" == "SOLARIS" -LINKFLAGSRUNPATH=-R/usr/sfw/lib -R\''$$ORIGIN'\' -.ENDIF - .IF "$(SNDFILE_LIBS)"!="" SNDFILELIB=$(SNDFILE_LIBS) .ENDIF @@ -55,6 +51,9 @@ SNDFILELIB=$(SNDFILE_LIBS) .INCLUDE : makefile.pmk .INCLUDE : makefile2.pmk +.IF "$(OS)" == "SOLARIS" +LINKFLAGSRUNPATH_OOO := -R/usr/sfw/lib $(LINKFLAGSRUNPATH_OOO) +.ENDIF # --- Allgemein ---------------------------------------------------------- |