diff options
Diffstat (limited to 'filter/source/config/fragments/makefile.mk')
| -rw-r--r-- | filter/source/config/fragments/makefile.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/filter/source/config/fragments/makefile.mk b/filter/source/config/fragments/makefile.mk index d398e03e5a7d..6503062bc654 100644 --- a/filter/source/config/fragments/makefile.mk +++ b/filter/source/config/fragments/makefile.mk @@ -185,8 +185,12 @@ $(ALL_FLAGS) : $(INCLUDE_FRAGMENTS) .IF "$(SOLAR_JAVA)"=="" #cmc, hack to workaround the java build requirement +.IF "$(SYSTEM_PYTHON)" == "YES" MERGE:=python ../tools/merge/pyAltFCFGMerge .ELSE +MERGE:=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/python ../tools/merge/pyAltFCFGMerge +.ENDIF +.ELSE MERGE := $(JAVAI) -jar $(SOLARBINDIR)$/FCFGMerge.jar .ENDIF |