diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-06-14 21:01:11 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-06-14 21:05:02 +0200 |
| commit | 83726096bfe32160f1fd0aab106a1052aec9ecaa (patch) | |
| tree | a7c127c3a3932c24461b57b6584cea478eb0d3d2 /pyuno | |
| parent | e9022aaa9053aff22cea804794a9eac082485626 (diff) | |
pyuno: more stuff unwanted if there is system python
Change-Id: I13d543f9f877f65f377ae914f8308876bf2c0532
Diffstat (limited to 'pyuno')
| -rwxr-xr-x | pyuno/Module_pyuno.mk | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/pyuno/Module_pyuno.mk b/pyuno/Module_pyuno.mk index 0f15ac5be631..e39bcd0ac99c 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: |