diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-11-27 15:32:36 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-11-27 16:57:19 +0100 |
| commit | 9d921baa17c3ee8d3c7be0cab5980d0f66319891 (patch) | |
| tree | 62f6b0b54e7f1db9a747ffc5a4065a509a0076b8 /pyuno/CustomTarget_zipcore.mk | |
| parent | 0c8e2ee3b4bf133d59fd956715418196e0922187 (diff) | |
clean up PYTHON related version etc. variables:
- configure defines PYTHON_VERSION, PYTHON_VERSION_MAJOR,
PYTHON_VERSION_MINOR
- remove pyversion.Makefile
Change-Id: I19ac8df18a520ad56bf63ea038dc0769b8249d0b
Diffstat (limited to 'pyuno/CustomTarget_zipcore.mk')
| -rw-r--r-- | pyuno/CustomTarget_zipcore.mk | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/pyuno/CustomTarget_zipcore.mk b/pyuno/CustomTarget_zipcore.mk index 98e3c292fc2f..dc2f5603c14f 100644 --- a/pyuno/CustomTarget_zipcore.mk +++ b/pyuno/CustomTarget_zipcore.mk @@ -28,17 +28,15 @@ $(eval $(call gb_CustomTarget_CustomTarget,pyuno/zipcore)) # system python (only mingw) ifeq ($(SYSTEM_PYTHON),YES) -# mingw: MINGW_PYVERSION and MINGW_SYSROOT are defined in configure +# mingw: MINGW_SYSROOT is defined in configure ifeq ($(GUI)$(COM),WNTGCC) -PYVERSION=$(MINGW_PYVERSION) -pyuno_PYTHON_LIB_DIR=$(MINGW_SYSROOT)/lib/python$(MINGW_PYTHON_MAJOR_VERSION) +pyuno_PYTHON_LIB_DIR=$(MINGW_SYSROOT)/lib/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR) endif else -include $(OUTDIR)/inc/pyversion.Makefile pyuno_PYTHON_LIB_DIR=$(OUTDIR)/lib/python endif -pyuno_PYTHON_ARCHIVE_NAME:=python-core-$(PYVERSION).zip +pyuno_PYTHON_ARCHIVE_NAME:=python-core-$(PYTHON_VERSION).zip FIND=find GREP=grep |