diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-01-15 11:35:32 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-01-15 11:35:32 +0000 |
| commit | 86fed07cb9084db89e4c9f414cf778b2e38de815 (patch) | |
| tree | 4b904d3da31e298571b852a9991cbe4828b4403e /officecfg | |
| parent | db57d8df3db9333b094fc7933fa6ee49f09609f0 (diff) | |
INTEGRATION: CWS systemxt (1.11.180); FILE MERGED
2006/11/22 16:05:38 rene 1.11.180.1: #i59985# add make XmlSearch buildable with upstream xt (by mkretzschmar)
Diffstat (limited to 'officecfg')
| -rw-r--r-- | officecfg/org/openoffice/configuration/makefile.mk | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/officecfg/org/openoffice/configuration/makefile.mk b/officecfg/org/openoffice/configuration/makefile.mk index 89f823ef4513..def0c3147349 100644 --- a/officecfg/org/openoffice/configuration/makefile.mk +++ b/officecfg/org/openoffice/configuration/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.11 $ +# $Revision: 1.12 $ # -# last change: $Author: vg $ $Date: 2006-03-16 11:13:38 $ +# last change: $Author: vg $ $Date: 2007-01-15 12:35:32 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -43,7 +43,13 @@ PACKAGE=org$/openoffice$/configuration .INCLUDE : settings.mk -JARFILES = xml-apis.jar xercesImpl.jar xt.jar +JARFILES = xml-apis.jar xercesImpl.jar + +.IF "$(SYSTEM_XT)" == "YES" +XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(XT_JAR) +.ELSE +JARFILES += xt.jar +.ENDIF JAVACLASSFILES= \ $(CLASSDIR)$/$(PACKAGE)$/XMLDefaultGenerator.class \ |