merge the formfield patch from ooo-build
[ooovba.git] / applied_patches / 0609-xmlhelp-build-without-java.diff
blobcdcce47d9236b4497abb00b20573d549e0bd8aa0
1 diff -rup xmlhelp-orig/source/com/sun/star/help/makefile.mk xmlhelp/source/com/sun/star/help/makefile.mk
2 --- xmlhelp-orig/source/com/sun/star/help/makefile.mk 2009-10-12 14:21:40.000000000 +0200
3 +++ xmlhelp/source/com/sun/star/help/makefile.mk 2009-10-12 14:25:53.000000000 +0200
4 @@ -40,6 +40,8 @@ TARGETTYPE=CUI
6 .INCLUDE : settings.mk
7 .INCLUDE : helplinker.pmk
9 +.IF "$(SOLAR_JAVA)"=="TRUE"
11 .IF "$(SYSTEM_LIBXSLT)" == "YES"
12 CFLAGS+= $(LIBXSLT_CFLAGS)
13 @@ -109,3 +111,9 @@ fix_system_lucene:
14 @echo "Fix Java Class-Path entry for Lucene libraries from system."
15 @$(SED) -r -e "s#^(Class-Path:).*#\1 file://$(LUCENE_CORE_JAR) file://$(LUCENE_ANALYZERS_JAR)#" \
16 -i ../../../../../$(INPATH)/class/HelpLinker/META-INF/MANIFEST.MF
18 +.ELSE
20 +.INCLUDE : target.mk
22 +.ENDIF