INTEGRATION: CWS sb91 (1.55.6); FILE MERGED

2008/07/22 07:44:06 sb 1.55.6.3: merged in 1.56.2.1
2008/07/16 07:21:56 sb 1.55.6.2: RESYNC: (1.55-1.56); FILE MERGED
2008/07/11 08:58:54 sb 1.55.6.1: #i91567# make buildable on unxsolu4 (but that does not yet lead to a working SDK on unxsolu4)
This commit is contained in:
Rüdiger Timm 2008-08-27 12:50:38 +00:00
parent daf791e97b
commit 491e72b2b2

View file

@ -8,7 +8,7 @@
# #
# $RCSfile: makefile.pmk,v $ # $RCSfile: makefile.pmk,v $
# #
# $Revision: 1.57 $ # $Revision: 1.58 $
# #
# This file is part of OpenOffice.org. # This file is part of OpenOffice.org.
# #
@ -132,6 +132,12 @@ DLLOUT=$(SOLARLIBDIR)
############## ##############
DESTPLATFROM=solsparc DESTPLATFROM=solsparc
.ELIF "$(OS)$(CPU)"=="SOLARISU"
##############
# SOLARIS SPARC 64
##############
DESTPLATFROM=solsparc64
.ELIF "$(OS)$(CPU)"=="SOLARISI" .ELIF "$(OS)$(CPU)"=="SOLARISI"
########## ##########
# SOLARIS INTEL # SOLARIS INTEL