filter/Configuration_filter.mk | 5 ----- 1 file changed, 5 deletions(-)
New commits: commit ebb4150463ef97571d8f4ffc0b8189ff94d5cf1a Author: Michael Stahl <[email protected]> Date: Fri Nov 30 21:28:00 2012 +0100 filter: try to use the Python implementation of FCFGMerge ... seems to work here, and if nobody complains about broken filter configurations we can remove the Java FCFGMerge implementation. Change-Id: I0cf2de604bb9c34678174bdf951e70d499ea7df1 diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk index dd4a09d..f84058e 100644 --- a/filter/Configuration_filter.mk +++ b/filter/Configuration_filter.mk @@ -21,15 +21,10 @@ # 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 ####################### _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
