[ooo-build-commit] Branch 'ooo/master' - transex3/prj transex3/source

[Jan Holesovsky]

 transex3/prj/build.lst           |    2 +-
 transex3/source/help/makefile.mk |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit dde3bf1292a591e18ed5f8d0217fc6cda1f04127
Author: Vladimir Glazounov <vg at openoffice.org>
Date:   Tue Sep 29 09:54:01 2009 +0000

    #i105433# fix for build breaker with system lucene

diff --git a/transex3/prj/build.lst b/transex3/prj/build.lst
index 1ba0a50..0017471 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 f010e25..edf68d9 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