diff options
| author | sb <sb@openoffice.org> | 2010-01-05 13:09:26 +0100 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-01-05 13:09:26 +0100 |
| commit | cbe15c44ec90d8910824a37d75d04ef1ab6183b3 (patch) | |
| tree | 06ac91339be5babbc864bc39cd99a5807480ac5c /filter/source/config/fragments | |
| parent | 2e645fd1d615a4f2288cdf3baa01aeebafa4e097 (diff) | |
| parent | 7fef57f108fe4f219773d5511040bd166ee0a01c (diff) | |
sb111: merged in DEV300_m68
Diffstat (limited to 'filter/source/config/fragments')
| -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 |