diff options
| author | Caolán McNamara <cmc@openoffice.org> | 2009-11-24 13:00:13 +0000 |
|---|---|---|
| committer | Caolán McNamara <cmc@openoffice.org> | 2009-11-24 13:00:13 +0000 |
| commit | e0838f570d254a525926ba79d8930df333119416 (patch) | |
| tree | 790f6b66b9faf449c64b5423887d40303a991338 /xmlhelp | |
| parent | 9bd1ae5e434619b04b6ed3c3a8973e2e0385fbd6 (diff) | |
cmcfixes67: #i101158# fix parallel build with system lucene, and remove unused copy of MANIFEST.MK
Diffstat (limited to 'xmlhelp')
| -rw-r--r-- | xmlhelp/source/com/sun/star/help/MANIFEST.MF | 1 | ||||
| -rw-r--r-- | xmlhelp/source/com/sun/star/help/makefile.mk | 12 |
2 files changed, 3 insertions, 10 deletions
diff --git a/xmlhelp/source/com/sun/star/help/MANIFEST.MF b/xmlhelp/source/com/sun/star/help/MANIFEST.MF index bf0e4ab46cb2..a4c5d50fde5c 100644 --- a/xmlhelp/source/com/sun/star/help/MANIFEST.MF +++ b/xmlhelp/source/com/sun/star/help/MANIFEST.MF @@ -1,2 +1 @@ RegistrationClassName: com.sun.star.help.HelpComponent -Class-Path: lucene-core-2.3.jar lucene-analyzers-2.3.jar diff --git a/xmlhelp/source/com/sun/star/help/makefile.mk b/xmlhelp/source/com/sun/star/help/makefile.mk index db6e619b31e3..8ba5d9a3a9a0 100644 --- a/xmlhelp/source/com/sun/star/help/makefile.mk +++ b/xmlhelp/source/com/sun/star/help/makefile.mk @@ -76,14 +76,15 @@ ADDFILES = $(subst,$(SOLARBINDIR)$/help,$(CLASSDIR) $(TRANSEX3FILES)) JARFILES = ridl.jar jurt.jar unoil.jar juh.jar .IF "$(SYSTEM_LUCENE)" == "YES" XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(LUCENE_CORE_JAR)$(PATH_SEPERATOR)$(LUCENE_ANALYZERS_JAR) -COMP=fix_system_lucene +JARCLASSPATH = file://$(LUCENE_CORE_JAR) file://$(LUCENE_ANALYZERS_JAR) .ELSE JARFILES += lucene-core-2.3.jar lucene-analyzers-2.3.jar +JARCLASSPATH = lucene-core-2.3.jar lucene-analyzers-2.3.jar .ENDIF JARTARGET = LuceneHelpWrapper.jar JARCOMPRESS = TRUE -CUSTOMMANIFESTFILE = MANIFEST.MF +CUSTOMMANIFESTFILE = MANIFEST.MF # --- Targets ------------------------------------------------------ @@ -94,15 +95,8 @@ ALLTAR : $(ADDFILES) .IF "$(JARTARGETN)"!="" $(JAVATARGET) : $(ADDFILES) $(JARTARGETN) : $(ADDFILES) -$(JARTARGETN) : $(COMP) .ENDIF $(CLASSDIR)$/$(PACKAGE)$/%.class : $(SOLARBINDIR)$/help$/$(PACKAGE)$/%.class $(MKDIRHIER) $(@:d) $(COPY) $< $@ - - -fix_system_lucene: - @echo "Fix Java Class-Path entry for Lucene libraries from system." - @$(SED) -r -e "s#^(Class-Path:).*#\1 file://$(LUCENE_CORE_JAR) file://$(LUCENE_ANALYZERS_JAR)#" \ - -i ../../../../../$(INPATH)/class/HelpLinker/META-INF/MANIFEST.MF |