diff options
| -rw-r--r-- | filter/Configuration_filter.mk | 6 | ||||
| -rw-r--r-- | filter/CustomTarget_svg.mk | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk index 5b41bdac1b3e..dd4a09d8a9a5 100644 --- a/filter/Configuration_filter.mk +++ b/filter/Configuration_filter.mk @@ -22,8 +22,10 @@ # semi-integrated with the stuff from Configuration.mk; not exactly pretty... ifeq ($(SOLAR_JAVA),) -filter_MERGE_TARGET := $(SRCDIR)/filter/source/config/tools/merge/pyAltFCFGMerge -filter_MERGE := $(gb_PYTHON) $(filter_MERGE_TARGET) +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) diff --git a/filter/CustomTarget_svg.mk b/filter/CustomTarget_svg.mk index f20b5c1cea62..1b374ff6969a 100644 --- a/filter/CustomTarget_svg.mk +++ b/filter/CustomTarget_svg.mk @@ -59,6 +59,7 @@ $(filter_GEN_svg_Tokens_cxx) : $(filter_GEN_svg_Tokens_gperf) > $(filter_GEN_svg_Tokens_cxx)) $(filter_GEN_svg_Script_hxx) : \ + $(gb_PYTHONTARGET) \ $(filter_SRC_svg_PresentationEngine) $(filter_SRC_svg_Js2Hxx) \ | $(filter_SVGWORK)/.dir $(call gb_Output_announce,$@,build,PY ,1) |