diff options
| author | David Ostrovsky <d.ostrovsky@gmx.de> | 2012-06-18 00:04:19 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-06-22 13:11:41 +0200 |
| commit | d712218cc0b658fae66f63c52af7996b714289c9 (patch) | |
| tree | 74ebe377301f044f5ebd13d7e0ef645817c24dc0 /pyuno/Module_pyuno.mk | |
| parent | 3f5245db4b0248bb55c37d3400b8155263880f6e (diff) | |
fixing pyuno bridge on mingw: packaging system-python
Change-Id: Ib46248d217b0161dc20dde0274842bd7381f0cda
Diffstat (limited to 'pyuno/Module_pyuno.mk')
| -rwxr-xr-x | pyuno/Module_pyuno.mk | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/pyuno/Module_pyuno.mk b/pyuno/Module_pyuno.mk index 06356e2b491f..723b08530c32 100755 --- a/pyuno/Module_pyuno.mk +++ b/pyuno/Module_pyuno.mk @@ -41,7 +41,11 @@ $(eval $(call gb_Module_add_targets,pyuno,\ )) endif -ifneq ($(SYSTEM_PYTHON),YES) +# +# Windows: only --enable-python=internal possible +# mingw: both cases possible: internal && system +# that why it makes sense to handle the next 3 targets +# with SYSTEM_PYTHON=YES and SYSTEM_PYTHON=NO # zipcore: pyuno/python.exe on Windows # zipcore: pyversion.hxx on Windows @@ -52,6 +56,7 @@ $(eval $(call gb_Module_add_targets,pyuno,\ )) endif +ifneq ($(SYSTEM_PYTHON),YES) # zipcore: python.sh on Unix ifeq ($(GUI),UNX) @@ -76,6 +81,16 @@ $(eval $(call gb_Module_add_targets,pyuno,\ )) endif +else # SYSTEM_PYTHON + +# previous two targets has to be executed also with system-python on mingw +ifeq ($(OS)$(COM),WNTGCC) +$(eval $(call gb_Module_add_targets,pyuno,\ + CustomTarget_zipcore \ + Package_zipcore \ +)) +endif + endif # SYSTEM_PYTHON endif # DISABLE_PYTHON |