pyuno/Module_pyuno.mk | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
New commits:
commit 83726096bfe32160f1fd0aab106a1052aec9ecaa
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Thu Jun 14 21:01:11 2012 +0200
pyuno: more stuff unwanted if there is system python
Change-Id: I13d543f9f877f65f377ae914f8308876bf2c0532
diff --git a/pyuno/Module_pyuno.mk b/pyuno/Module_pyuno.mk
index 0f15ac5..e39bcd0 100755
--- a/pyuno/Module_pyuno.mk
+++ b/pyuno/Module_pyuno.mk
@@ -41,6 +41,8 @@ $(eval $(call gb_Module_add_targets,pyuno,\
))
endif
+ifneq ($(SYSTEM_PYTHON),YES)
+
# zipcore: python.exe on Windows
# zipcore: pyversion.hxx on Windows
ifeq ($(OS),WNT)
@@ -53,7 +55,6 @@ endif
# zipcore: python.sh on Unix
-ifneq ($(SYSTEM_PYTHON),YES)
ifeq ($(GUI),UNX)
$(eval $(call gb_Module_add_targets,pyuno,\
CustomTarget_python_shell \
@@ -66,21 +67,18 @@ $(eval $(call gb_Module_add_targets,pyuno,\
))
endif
endif
-endif
# python-zipcore-$(PYVESION) not on MACOSX
# (OOoPython.framework.zip is already delivered for MACOSX in python module)
-ifneq ($(SYSTEM_PYTHON),YES)
ifneq ($(OS),MACOSX)
$(eval $(call gb_Module_add_targets,pyuno,\
CustomTarget_zipcore \
Package_zipcore \
))
endif
-endif
-
-endif # DISABLE_PYTHON
+endif # SYSTEM_PYTHON
+endif # DISABLE_PYTHON
# vim:set shiftwidth=4 softtabstop=4 expandtab:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
