summaryrefslogtreecommitdiff
path: root/scp2
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2007-01-10 10:28:13 +0000
committerVladimir Glazounov <vg@openoffice.org>2007-01-10 10:28:13 +0000
commita02c97a614618b51e1b6d72da748825856bd07a8 (patch)
tree6600ab42476a356632675aad36bb412b14c3f0cf /scp2
parent775becece9ce8112b6ad5d9722edbf37283beff4 (diff)
INTEGRATION: CWS pj70 (1.47.18); FILE MERGED
2007/01/09 11:22:43 pjanik 1.47.18.2: RESYNC: (1.47-1.48); FILE MERGED 2007/01/05 09:07:19 pjanik 1.47.18.1: #i73127#: Add system ICU support.
Diffstat (limited to 'scp2')
-rw-r--r--scp2/source/ooo/makefile.mk6
1 files changed, 4 insertions, 2 deletions
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index 71111581d2e7..d4f994b49e50 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -4,9 +4,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.48 $
+# $Revision: 1.49 $
#
-# last change: $Author: hr $ $Date: 2007-01-02 15:29:57 $
+# last change: $Author: vg $ $Date: 2007-01-10 11:28:13 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@@ -249,6 +249,8 @@ ULFFILES= \
# --- File ---------------------------------------------------------
.INCLUDE : target.mk
+.IF "$(SYSTEM_ICU)" != "YES"
$(ICUVERSION_DEPENDENT_FILES) : $(SOLARINCDIR)$/icuversion.mk
+.ENDIF
$(ISOLANGVERSION_DEPENDENT_FILES) : $(SOLARINCDIR)$/i18npool/version.mk