[Libreoffice-commits] .: filter/Configuration_filter.mk

[Libreoffice Gerrit user]

 filter/Configuration_filter.mk |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit ed10194ea833b42b486bdc5b4c18ef7e63862b89
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Fri Nov 30 23:50:12 2012 +0100

    Revert "filter: try to use the Python implementation of FCFGMerge"
    
    This reverts commit ebb4150463ef97571d8f4ffc0b8189ff94d5cf1a.

diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk
index f84058e..dd4a09d 100644
--- a/filter/Configuration_filter.mk
+++ b/filter/Configuration_filter.mk
@@ -21,10 +21,15 @@
 # most of the rules here use some weird merge program, and this is sort of
 # semi-integrated with the stuff from Configuration.mk; not exactly pretty...
 
+ifeq ($(SOLAR_JAVA),)
 filter_MERGE_TARGET := $(gb_PYTHONTARGET) \
 	$(SRCDIR)/filter/source/config/tools/merge/pyAltFCFGMerge
 filter_MERGE := $(gb_PYTHON) \
 	$(SRCDIR)/filter/source/config/tools/merge/pyAltFCFGMerge
+else # SOLAR_JAVA
+filter_MERGE_TARGET := $(OUTDIR_FOR_BUILD)/bin/FCFGMerge.jar
+filter_MERGE := $(JAVAINTERPRETER) $(JAVAIFLAGS) -jar $(filter_MERGE_TARGET)
+endif
 filter_MERGE_CONFIG_TARGET := $(OUTDIR_FOR_BUILD)/inc/l10ntools/FCFGMerge.cfg
 
 ### filter configuration rules: generic stuff #######################