Author: pfg
Date: Mon Dec 10 19:56:46 2012
New Revision: 1419709
URL: http://svn.apache.org/viewvc?rev=1419709&view=rev
Log:
Fixes to build with SYSTEM_LUCENE.
Modified:
openoffice/trunk/main/external_deps.lst
openoffice/trunk/main/lucene/makefile.mk
Modified: openoffice/trunk/main/external_deps.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/external_deps.lst?rev=1419709&r1=1419708&r2=1419709&view=diff
==============================================================================
--- openoffice/trunk/main/external_deps.lst (original)
+++ openoffice/trunk/main/external_deps.lst Mon Dec 10 19:56:46 2012
@@ -70,7 +70,7 @@ if ( true )
name = Adobe-Core35_AFMs-314.tar.gz
URL1 = $(OOO_EXTRAS)$(MD5)-$(name)
-if (SOLAR_JAVA == TRUE)
+if (SOLAR_JAVA==TRUE && SYSTEM_LUCENE!=YES)
MD5 = 17960f35b2239654ba608cf1f3e256b3
name = lucene-2.9.4-src.tar.gz
URL1 =
http://archive.apache.org/dist/lucene/java/2.9.4/lucene-2.9.4-src.tar.gz
Modified: openoffice/trunk/main/lucene/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/lucene/makefile.mk?rev=1419709&r1=1419708&r2=1419709&view=diff
==============================================================================
--- openoffice/trunk/main/lucene/makefile.mk (original)
+++ openoffice/trunk/main/lucene/makefile.mk Mon Dec 10 19:56:46 2012
@@ -31,9 +31,17 @@ TARGET=so_lucene
.INCLUDE : settings.mk
.INCLUDE : antsettings.mk
-# --- Files --------------------------------------------------------
.IF "$(SOLAR_JAVA)" != ""
+.IF "$(SYSTEM_LUCENE)" == "YES"
+
+all:
+ @echo "An already available installation of Apache Lucene should exist
on your system."
+ @echo "Therefore the version provided here does not need to be built in
addition."
+
+.ENDIF
+
+# --- Files --------------------------------------------------------
LUCENE_MAJOR=2
LUCENE_MINOR=9
@@ -59,7 +67,10 @@ BUILD_ACTION= ${ANT} -buildfile .$/contr
OUT2BIN=.$/build$/$(LUCENE_CORE_JAR)
.$/build$/contrib$/analyzers/common$/$(LUCENE_ANALYZERS_JAR)
-.ENDIF
+.ELSE # $(SOLAR_JAVA)!= ""
+nojava:
+ @echo "Not building $(PRJNAME) because Java is disabled"
+.ENDIF # $(SOLAR_JAVA)!= ""
# --- Targets ------------------------------------------------------
