diff options
| author | Thomas Gellekum <tg@FreeBSD.org> | 2001-08-03 11:20:33 +0000 |
|---|---|---|
| committer | Thomas Gellekum <tg@FreeBSD.org> | 2001-08-03 11:20:33 +0000 |
| commit | f535a67aba786fdb34c1759a5eaad65b8a959c0a (patch) | |
| tree | b02cea8851ea0a599d698b5c4eb244aca39a492f /Mk | |
| parent | Upgrade to 1.1.6.3 (i. e. include patch-1.1.6fix3). (diff) | |
Use a variable for PYTHON_PORTVERSION.
Notes
Notes:
svn path=/head/; revision=45768
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.port.mk | 2 | ||||
| -rw-r--r-- | Mk/bsd.python.mk | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 91ff2f04f0ee..d08570149327 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -702,7 +702,7 @@ MAKE_ENV+= OPENSSLLIB=${OPENSSLLIB} OPENSSLINC=${OPENSSLINC} \ .include "${PORTSDIR}/Mk/bsd.emacs.mk" .endif -.if defined(USE_PYTHON) || defined(PYTHON_VERSION) +.if defined(USE_PYTHON) .include "${PORTSDIR}/Mk/bsd.python.mk" .endif diff --git a/Mk/bsd.python.mk b/Mk/bsd.python.mk index 7af097482977..29c0450f6ce3 100644 --- a/Mk/bsd.python.mk +++ b/Mk/bsd.python.mk @@ -79,20 +79,21 @@ Python_Include_MAINTAINER= tg@FreeBSD.org _PYTHON_VERSION!= (python -c 'import sys; print sys.version[:3]') 2> /dev/null \ || echo 2.1 PYTHON_VERSION?= python${_PYTHON_VERSION} +_PYTHON_PORTVERSION= 2.1.1 PYTHON_PORTVERSION!= (${PYTHON_VERSION} -c 'import string, sys; \ print string.split(sys.version)[0]') 2> /dev/null \ - || echo 2.1 + || echo ${_PYTHON_PORTVERSION} # Python-2.1 .if ${PYTHON_VERSION} == "python2.1" PYDISTUTILS= ${PYTHON_LIBDIR}/distutils/core.py:${PYTHON_PORTSDIR} PYXML= ${PYTHON_SITELIBDIR}/_xmlplus/__init__.py:${PORTSDIR}/textproc/py-xml -PYTHON_DISTFILE= Python-2.1.1.tgz +PYTHON_DISTFILE= Python-${_PYTHON_PORTVERSION}.tgz PYTHON_PORTSDIR= ${PORTSDIR}/lang/python PYTHON_REL= 211 PYTHON_SUFFIX= # empty, default version -PYTHON_WRKSRC= ${WRKDIR}/Python-2.1.1 +PYTHON_WRKSRC= ${WRKDIR}/Python-${_PYTHON_PORTVERSION} # Python-2.0 .elif ${PYTHON_VERSION} == "python2.0" |