summaryrefslogtreecommitdiff
path: root/lucene
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2008-10-02 09:32:08 +0000
committerVladimir Glazounov <vg@openoffice.org>2008-10-02 09:32:08 +0000
commitc79259fde1d65ac52f839fd04b9b2a06b127aa26 (patch)
treeab98e2dc580c8fb36a884869684ed35617fa3258 /lucene
parentc30ae0c43180cf994ea09cc283f0d2d7f1b4b259 (diff)
#100000# fixes from ooo300m7masterfix
Diffstat (limited to 'lucene')
-rw-r--r--lucene/makefile.mk10
1 files changed, 8 insertions, 2 deletions
diff --git a/lucene/makefile.mk b/lucene/makefile.mk
index fb1cafed351c..23173d5a2d5c 100644
--- a/lucene/makefile.mk
+++ b/lucene/makefile.mk
@@ -8,7 +8,7 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.4 $
+# $Revision: 1.3.2.2 $
#
# This file is part of OpenOffice.org.
#
@@ -41,6 +41,8 @@ TARGET=so_lucene
.INCLUDE : antsettings.mk
# --- Files --------------------------------------------------------
+.IF "$(SOLAR_JAVA)" != ""
+
LUCENE_MAJOR=2
LUCENE_MINOR=3
LUCENE_MICRO=2
@@ -58,9 +60,13 @@ BUILD_ACTION= ${ANT} -buildfile .$/contrib$/analyzers$/build.xml
OUT2BIN=.$/build$/$(LUCENE_CORE_JAR) .$/build$/contrib$/analyzers$/$(LUCENE_ANALYZERS_JAR)
+.ENDIF
+
# --- Targets ------------------------------------------------------
.INCLUDE : set_ext.mk
.INCLUDE : target.mk
-.INCLUDE : tg_ext.mk
+.IF "$(SOLAR_JAVA)" != ""
+.INCLUDE : tg_ext.mk
+.ENDIF