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_pyversion.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_pyversion.mk')
| -rw-r--r-- | pyuno/CustomTarget_pyversion.mk | 12 |
1 files changed, 1 insertions, 11 deletions
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: |