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_python_shell.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_python_shell.mk')
| -rw-r--r-- | pyuno/CustomTarget_python_shell.mk | 6 |
1 files changed, 2 insertions, 4 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 |