clean up PYTHON related version etc. variables:

- configure defines PYTHON_VERSION, PYTHON_VERSION_MAJOR,
  PYTHON_VERSION_MINOR
- remove pyversion.Makefile

Change-Id: I19ac8df18a520ad56bf63ea038dc0769b8249d0b

4 files changed, 7 insertions, 32 deletions

diff --git a/pyuno/CustomTarget_python_shell.mk b/pyuno/CustomTarget_python_shell.mk
index cf64f533ba7b..feed2e48730a 100644
--- a/pyuno/CustomTarget_python_shell.mk
+++ b/pyuno/CustomTarget_python_shell.mk
@@ -29,13 +29,11 @@ $(eval $(call gb_CustomTarget_CustomTarget,pyuno/python_shell))
 $(call gb_CustomTarget_get_target,pyuno/python_shell) : \
     $(call gb_CustomTarget_get_workdir,pyuno/python_shell)/python.sh
 
-include $(OUTDIR)/inc/pyversion.Makefile
-
 ifeq ($(OS),MACOSX)
-pyuno_PYTHON_SHELL_VERSION:=$(PYMAJOR).$(PYMINOR)
+pyuno_PYTHON_SHELL_VERSION:=$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)
 pyuno_PYTHON_SHELL_STRIPRULE:=-e '/^NONMACSECTION/,/^MACSECTION/d'
 else
-pyuno_PYTHON_SHELL_VERSION:=$(PYVERSION)
+pyuno_PYTHON_SHELL_VERSION:=$(PYTHON_VERSION)
 pyuno_PYTHON_SHELL_STRIPRULE:=-e '/^NONMACSECTION/d' -e '/^MACSECTION/,$$d'
 endif
 
diff --git a/pyuno/CustomTarget_pyversion.mk b/pyuno/CustomTarget_pyversion.mk
index 41b26c1831da..acfec165f47b 100644
--- a/pyuno/CustomTarget_pyversion.mk
+++ b/pyuno/CustomTarget_pyversion.mk
@@ -29,19 +29,9 @@ $(eval $(call gb_CustomTarget_CustomTarget,pyuno/pyversion))
 $(call gb_CustomTarget_get_target,pyuno/pyversion) : \
     $(call gb_CustomTarget_get_workdir,pyuno/pyversion)/pyversion.hxx
 
-# 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
-
 $(call gb_CustomTarget_get_workdir,pyuno/pyversion)/pyversion.hxx : $(SRCDIR)/pyuno/zipcore/pyversion.inc | \
     $(call gb_CustomTarget_get_workdir,pyuno/pyversion)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SED,1)
-	sed -e "s/@/$(PYVERSION)/g" < $? > $@
+	sed -e "s/@/$(PYTHON_VERSION)/g" < $? > $@
 
 # vim: set noet sw=4 ts=4:
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
 
diff --git a/pyuno/Package_zipcore.mk b/pyuno/Package_zipcore.mk
index 3666ad7a7252..c75c46bfbe10 100644
--- a/pyuno/Package_zipcore.mk
+++ b/pyuno/Package_zipcore.mk
@@ -26,19 +26,8 @@
 
 $(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
+pyuno_PYTHON_ARCHIVE_NAME:=python-core-$(PYTHON_VERSION).zip
 
 $(eval $(call gb_Package_add_file,python_zipcore,bin/$(pyuno_PYTHON_ARCHIVE_NAME),$(pyuno_PYTHON_ARCHIVE_NAME)))
 
-
 # vim: set noet sw=4 ts=4: