INTEGRATION: CWS ause070 (1.12.68); FILE MERGED

2006/10/18 15:15:34 hjs 1.12.68.2: #i70136# change check to work with configure default
2006/10/06 16:12:10 hjs 1.12.68.1: #i70136# local .ulf targets
This commit is contained in:
Kurt Zenker 2006-11-08 10:55:50 +00:00
parent dadfe0139f
commit 3b007ff52c

View file

@ -4,9 +4,9 @@
#
# $RCSfile: makefile.mk,v $
#
# $Revision: 1.12 $
# $Revision: 1.13 $
#
# last change: $Author: rt $ $Date: 2006-01-13 14:57:50 $
# last change: $Author: kz $ $Date: 2006-11-08 11:55:50 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@ -99,7 +99,11 @@ PKGFILE = $(BIN)$/pkg$/openoffice.org-desktop-integration.tar.gz
PKGDATESTRING = $(shell date -u +%Y.%m.%d)
PKGARCH=sparc,i386
.IF "$(WITH_LANG)"!=""
ULFDIR = $(COMMONMISC)$/desktopshare
.ELSE # "$(WITH_LANG)"!=""
ULFDIR:=..$/share
.ENDIF # "$(WITH_LANG)"!=""
FASPAC=`test -f $(SOLARBINDIR)/faspac-so.sh && echo "/sbin/sh" || echo "echo"`