summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2009-09-29 09:54:01 +0000
committerVladimir Glazounov <vg@openoffice.org>2009-09-29 09:54:01 +0000
commit09084d2efb60ae115cd919e4bb3be55f37201534 (patch)
treedd830e3e76cb08420d1950c61aab5d0a2775fa8c
parent3179dc6eb249c4ddf5470386dd4cbf69e145a701 (diff)
#i105433# fix for build breaker with system lucene
-rw-r--r--transex3/prj/build.lst2
-rw-r--r--transex3/source/help/makefile.mk4
2 files changed, 3 insertions, 3 deletions
diff --git a/transex3/prj/build.lst b/transex3/prj/build.lst
index 1ba0a50ff41c..0017471af134 100644
--- a/transex3/prj/build.lst
+++ b/transex3/prj/build.lst
@@ -1,4 +1,4 @@
-tr transex3 : tools libxslt berkeleydb lucene NULL
+tr transex3 : tools libxslt berkeleydb LUCENE:lucene NULL
tr transex3 usr1 - all tr_mkout NULL
tr transex3\inc nmake - all tr_inc NULL
tr transex3\source nmake - all tr_src tr_inc NULL
diff --git a/transex3/source/help/makefile.mk b/transex3/source/help/makefile.mk
index f010e256368e..edf68d906133 100644
--- a/transex3/source/help/makefile.mk
+++ b/transex3/source/help/makefile.mk
@@ -112,7 +112,7 @@ JAVACLASSFILES = \
#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)
+CLASSPATH!:=$(CLASSPATH)$(PATH_SEPERATOR)$(LUCENE_CORE_JAR)$(PATH_SEPERATOR)$(LUCENE_ANALYZERS_JAR)
COMP=fix_system_lucene
.ELSE
JARFILES += lucene-core-2.3.jar lucene-analyzers-2.3.jar
@@ -136,4 +136,4 @@ $(JARTARGETN) : $(COMP)
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
+ -i ../../$(INPATH)/class/HelpLinker/META-INF/MANIFEST.MF