summaryrefslogtreecommitdiff
path: root/scp2/source
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2008-07-11 09:32:27 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2008-07-11 09:32:27 +0000
commit5a695e215fda17917c9ddefa6f310d0a5606a74a (patch)
tree889e04658a868c90360320f4fb3c5c2aec132391 /scp2/source
parentb7efcf0350c93ddc22b481d8b4f08b551c7347f3 (diff)
INTEGRATION: CWS mst01 (1.69.42); FILE MERGED
2008/06/27 11:48:28 mst 1.69.42.1: - scp2/source/ooo/{makefile.mk,file_library_ooo.scp,shortcut_ooo.scp}: + gid_File_Lib_Xslt: use include makefile libxsltversion.mk for soname versioning
Diffstat (limited to 'scp2/source')
-rw-r--r--scp2/source/ooo/makefile.mk8
1 files changed, 7 insertions, 1 deletions
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index 8109345a2b22..7f1bcc2aa5f0 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.73 $
+# $Revision: 1.74 $
#
# This file is part of OpenOffice.org.
#
@@ -105,6 +105,12 @@ SCPDEFS+=-DSYSTEM_LIBXML
.IF "$(SYSTEM_LIBXSLT)" == "YES"
SCPDEFS+=-DSYSTEM_LIBXSLT
+.ELSE
+.INCLUDE : libxsltversion.mk
+SCPDEFS+=\
+ -DLIBXSLT_MAJOR=$(LIBXSLT_MAJOR) \
+ -DLIBXSLT_MINOR=$(LIBXSLT_MINOR) \
+ -DLIBXSLT_MICRO=$(LIBXSLT_MICRO)
.ENDIF
.IF "$(SYSTEM_DB)" == "YES"