summaryrefslogtreecommitdiff
path: root/pyuno/Package_zipcore.mk
diff options
context:
space:
mode:
authorDavid Ostrovsky <d.ostrovsky@gmx.de>2012-06-18 00:04:19 +0200
committerDavid Tardon <dtardon@redhat.com>2012-06-22 13:11:41 +0200
commitd712218cc0b658fae66f63c52af7996b714289c9 (patch)
tree74ebe377301f044f5ebd13d7e0ef645817c24dc0 /pyuno/Package_zipcore.mk
parent3f5245db4b0248bb55c37d3400b8155263880f6e (diff)
fixing pyuno bridge on mingw: packaging system-python
Change-Id: Ib46248d217b0161dc20dde0274842bd7381f0cda
Diffstat (limited to 'pyuno/Package_zipcore.mk')
-rw-r--r--pyuno/Package_zipcore.mk9
1 files changed, 9 insertions, 0 deletions
diff --git a/pyuno/Package_zipcore.mk b/pyuno/Package_zipcore.mk
index 9069a8fdd32c..3666ad7a7252 100644
--- a/pyuno/Package_zipcore.mk
+++ b/pyuno/Package_zipcore.mk
@@ -26,7 +26,16 @@
$(eval $(call gb_Package_Package,python_zipcore,$(call gb_CustomTarget_get_workdir,pyuno/zipcore)))
+# system python
+ifeq ($(SYSTEM_PYTHON),YES)
+# mingw: MINGW_PYVERSION is defined in configure
+ifeq ($(GUI)$(COM),WNTGCC)
+PYVERSION=$(MINGW_PYVERSION)
+endif
+else
include $(OUTDIR)/inc/pyversion.Makefile
+endif
+
pyuno_PYTHON_ARCHIVE_NAME:=python-core-$(PYVERSION).zip
$(eval $(call gb_Package_add_file,python_zipcore,bin/$(pyuno_PYTHON_ARCHIVE_NAME),$(pyuno_PYTHON_ARCHIVE_NAME)))