diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2013-03-09 12:34:34 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2013-03-11 15:59:16 +0100 |
| commit | 17b2ace79b86bd772d9eb48b9c4ad69c0713695c (patch) | |
| tree | f561c8235905ebc740b1b7ac2802de638bf6cd8c /filter/Configuration_filter.mk | |
| parent | 77e21bb36a2cdaaa0f4049dee0d45c5b2325c6e9 (diff) | |
filter: use python version of FCFGMerge
Change-Id: I23124b919359c1217529724338b8d4906e051306
Diffstat (limited to 'filter/Configuration_filter.mk')
| -rw-r--r-- | filter/Configuration_filter.mk | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk index c37d4ad50f90..6f36649c9541 100644 --- a/filter/Configuration_filter.mk +++ b/filter/Configuration_filter.mk @@ -21,16 +21,11 @@ # 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 := $(call gb_ExternalExecutable_get_dependencies,python) \ $(SRCDIR)/filter/source/config/tools/merge/pyAltFCFGMerge filter_MERGE := $(call gb_ExternalExecutable_get_command,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_MERGE_CONFIG_TARGET := $(SRCDIR)/filter/source/config/tools/merge/FCFGMerge.cfg ### filter configuration rules: generic stuff ####################### |