[Libreoffice-commits] .: Branch 'libreoffice-3-3' - filter/source

[Robert Nagy]

 filter/source/config/fragments/makefile.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9fd267985820db81454cce1b4a76752769b471b7
Author: Thomas Klausner <wiz at NetBSD.org>
Date:   Sat Nov 6 00:30:42 2010 +0100

    Use PYTHON as passed through by set_soenv.in.

diff --git a/filter/source/config/fragments/makefile.mk b/filter/source/config/fragments/makefile.mk
index d827b34..c97818b 100644
--- a/filter/source/config/fragments/makefile.mk
+++ b/filter/source/config/fragments/makefile.mk
@@ -182,7 +182,7 @@ $(ALL_FLAGS) : $(INCLUDE_FRAGMENTS)
 .IF "$(SOLAR_JAVA)"==""
 #cmc, hack to workaround the java build requirement
 .IF "$(SYSTEM_PYTHON)" == "YES"
-MERGE:=python ../tools/merge/pyAltFCFGMerge
+MERGE:=$(PYTHON) ../tools/merge/pyAltFCFGMerge
 .ELSE
 MERGE:=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/python ../tools/merge/pyAltFCFGMerge
 .ENDIF