strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pyuno: more stuff unwanted if there is system python

Browse source 
Change-Id: I13d543f9f877f65f377ae914f8308876bf2c0532
This commit is contained in:
Matúš Kukan 2012-06-14 21:01:11 +02:00
parent e9022aaa90
commit 83726096bf
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pyuno/Module_pyuno.mk
View file

@ -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 # SYSTEM_PYTHON
endif # DISABLE_PYTHON
# vim:set shiftwidth=4 softtabstop=4 expandtab: