summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2008-08-27 12:52:14 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2008-08-27 12:52:14 +0000
commitee6d0cea8dbcd814dd3552860af5f4433425c9a8 (patch)
tree300f0052eb336b9bd9957c95f96e54914b0c9725
parentbad84beacb186b3d356ea12bf132fb15a5b3701e (diff)
INTEGRATION: CWS sb91 (1.110.22); FILE MERGED
2008/07/24 08:40:46 sb 1.110.22.2: #i91567# improved previous fix 2008/07/14 15:20:50 sb 1.110.22.1: #i91567# adapt to unxsolu4
-rw-r--r--vcl/util/makefile.mk6
1 files changed, 5 insertions, 1 deletions
diff --git a/vcl/util/makefile.mk b/vcl/util/makefile.mk
index ed06a53d1036..adae0f075198 100644
--- a/vcl/util/makefile.mk
+++ b/vcl/util/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.112 $
+# $Revision: 1.113 $
#
# This file is part of OpenOffice.org.
#
@@ -47,8 +47,12 @@ SNDFILELIB=$(SNDFILE_LIBS)
.INCLUDE : makefile2.pmk
.IF "$(OS)" == "SOLARIS"
+.IF "$(CPUNAME)" == "SPARC" && "$(CPU)" == "U"
+LINKFLAGSRUNPATH_OOO := -R/usr/sfw/lib/64 $(LINKFLAGSRUNPATH_OOO)
+.ELSE
LINKFLAGSRUNPATH_OOO := -R/usr/sfw/lib $(LINKFLAGSRUNPATH_OOO)
.ENDIF
+.ENDIF
# --- Allgemein ----------------------------------------------------------