diff options
| author | Mikhail Voitenko <mav@openoffice.org> | 2008-02-12 15:00:36 +0000 |
|---|---|---|
| committer | Mikhail Voitenko <mav@openoffice.org> | 2008-02-12 15:00:36 +0000 |
| commit | 0b07164c327b79a212419a4839336b24b549c5cf (patch) | |
| tree | 23c63c50cf929fd5b260feb6383ebd4cfa1341c6 | |
| parent | a0f9dfe0ebce9fd4d29e306212bfb67e564c1a50 (diff) | |
fix pathes
| -rw-r--r-- | swext/mediawiki/build.xml | 5 | ||||
| -rw-r--r-- | swext/mediawiki/makefile.mk | 16 |
2 files changed, 8 insertions, 13 deletions
diff --git a/swext/mediawiki/build.xml b/swext/mediawiki/build.xml index 33e213545cfe..47caae95b89e 100644 --- a/swext/mediawiki/build.xml +++ b/swext/mediawiki/build.xml @@ -5,9 +5,9 @@ * * $RCSfile: build.xml,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: mav $ $Date: 2008-02-11 13:25:15 $ + * last change: $Author: mav $ $Date: 2008-02-12 16:00:36 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -70,7 +70,6 @@ <pathelement location="${officeclasses}/jut.jar"/> <pathelement location="${officeclasses}/ridl.jar"/> <pathelement location="${officeclasses}/unoil.jar"/> - <pathelement location="${officeclasses}/xml-apis.jar"/> <!-- 3rd party libs --> <pathelement location="${commons-codec-jar}"/> <pathelement location="${commons-httpclient-jar}"/> diff --git a/swext/mediawiki/makefile.mk b/swext/mediawiki/makefile.mk index f13ba81b640a..2fc99e75f31f 100644 --- a/swext/mediawiki/makefile.mk +++ b/swext/mediawiki/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.6 $ +# $Revision: 1.7 $ # -# last change: $Author: mav $ $Date: 2008-02-11 13:25:15 $ +# last change: $Author: mav $ $Date: 2008-02-12 16:00:36 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -41,14 +41,10 @@ TARGET=mediawiki .INCLUDE : ant.mk .IF "$(SYSTEM_APACHE_COMMONS)" != "YES" -COMMONS_CODEC_JAR=$(SOLARVER)$/$(INPATH)$/bin$/commons-codec-1.3.jar -COMMONS_LANG_JAR=$(SOLARVER)$/$(INPATH)$/bin$/commons-lang-2.3.jar -COMMONS_HTTPCLIENT_JAR=$(SOLARVER)$/$(INPATH)$/bin$/commons-httpclient-3.1.jar -COMMONS_LOGGING_JAR=$(SOLARVER)$/$(INPATH)$/bin$/commons-logging-1.1.1.jar -.ENDIF - -.IF "$(SYSTEM_XML_APIS)" != "YES" -XML_APIS_JAR = $(SOLARVER)$/$(INPATH)$/lib/xml-apis.jar +COMMONS_CODEC_JAR=$(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/commons-codec-1.3.jar +COMMONS_LANG_JAR=$(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/commons-lang-2.3.jar +COMMONS_HTTPCLIENT_JAR=$(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/commons-httpclient-3.1.jar +COMMONS_LOGGING_JAR=$(SOLARVER)$/$(INPATH)$/bin$(UPDMINOREXT)$/commons-logging-1.1.1.jar .ENDIF ANT_FLAGS+=-Dcommons-codec-jar=$(COMMONS_CODEC_JAR) -Dcommons-lang-jar=$(COMMONS_LANG_JAR) -Dcommons-httpclient-jar=$(COMMONS_HTTPCLIENT_JAR) -Dcommons-logging-jar=$(COMMONS_LOGGING_JAR) -Dxml-apis-jar=$(XML_APIS_JAR) |