diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-11-30 23:50:12 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2012-11-30 23:50:12 +0100 |
| commit | ed10194ea833b42b486bdc5b4c18ef7e63862b89 (patch) | |
| tree | 0d086a8f377c2f7871009fd8ae7424d109cc2933 /filter | |
| parent | 9bfa09273ea0b7c9a351802d105230930951b901 (diff) | |
Revert "filter: try to use the Python implementation of FCFGMerge"
This reverts commit ebb4150463ef97571d8f4ffc0b8189ff94d5cf1a.
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/Configuration_filter.mk | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk index f84058e6e837..dd4a09d8a9a5 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 ####################### |