summaryrefslogtreecommitdiff
path: root/lang/python
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2002-09-20 22:53:21 +0000
committerjlam <jlam@pkgsrc.org>2002-09-20 22:53:21 +0000
commit587bd5400fe9b1a8c8d24b4ba942ad621594362e (patch)
tree462933b0b03a62a8779d847333650cc10a1a6114 /lang/python
parente561b87e43fd3f8f1aea106f624cfd074c02caa6 (diff)
downloadpkgsrc-587bd5400fe9b1a8c8d24b4ba942ad621594362e.tar.gz
Move the definitions for PYINC, PYLIB, and PYSITELIB to pyversion.mk
so that they may be used by buildlink2.mk files.
Diffstat (limited to 'lang/python')
-rw-r--r--lang/python/extension.buildlink.mk15
-rw-r--r--lang/python/pyversion.mk15
2 files changed, 13 insertions, 17 deletions
diff --git a/lang/python/extension.buildlink.mk b/lang/python/extension.buildlink.mk
index 7fb852f0937..28fbab3d122 100644
--- a/lang/python/extension.buildlink.mk
+++ b/lang/python/extension.buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: extension.buildlink.mk,v 1.11 2002/09/04 14:28:37 drochner Exp $
+# $NetBSD: extension.buildlink.mk,v 1.12 2002/09/20 22:53:21 jlam Exp $
# derive a python version from the package name if possible
.if defined(PKGNAME_REQD)
@@ -7,25 +7,12 @@ PYTHON_VERSION_REQD?= ${PKGNAME_REQD:C/^py([^-]*)-.*/\1/}
.include "../../lang/python/pyversion.mk"
-#
-# below is what used to be in bsd.python.mk
-#
-
.if defined(PYBINMODULE)
.if ${MACHINE_ARCH} == "mips" || ${MACHINE_ARCH} == "vax"
IGNORE="${PKGNAME} needs dynamic loading"
.endif
.endif
-.if exists(${PYTHONBIN})
-PYINC!= ${PYTHONBIN} -c "import distutils.sysconfig; \
- print distutils.sysconfig.get_python_inc(0, \"\")" || ${ECHO} ""
-PYLIB!= ${PYTHONBIN} -c "import distutils.sysconfig; \
- print distutils.sysconfig.get_python_lib(0, 1, \"\")" || ${ECHO} ""
-PYSITELIB!= ${PYTHONBIN} -c "import distutils.sysconfig; \
- print distutils.sysconfig.get_python_lib(0, 0, \"\")" || ${ECHO} ""
-.endif
-
.if defined(PYDISTUTILSPKG)
PYSETUP?= setup.py
PYSETUPBUILDARGS?= #empty
diff --git a/lang/python/pyversion.mk b/lang/python/pyversion.mk
index 7b8085b1087..3a1aa44fc45 100644
--- a/lang/python/pyversion.mk
+++ b/lang/python/pyversion.mk
@@ -1,4 +1,4 @@
-# $NetBSD: pyversion.mk,v 1.10 2002/09/20 22:32:35 jlam Exp $
+# $NetBSD: pyversion.mk,v 1.11 2002/09/20 22:53:22 jlam Exp $
.if !defined(PYTHON_PYVERSION_MK)
PYTHON_PYVERSION_MK= defined
@@ -119,8 +119,6 @@ BUILD_DEPENDS+= py15-distutils-*:../../devel/py-distutils
error: no valid Python version
.endif
-PYTHONBIN= ${LOCALBASE}/bin/python${PYVERSSUFFIX}
-
.if defined(USE_BUILDLINK2)
. if defined(PYTHON_FOR_BUILD_ONLY)
BUILD_DEPMETHOD.python?= build
@@ -134,4 +132,15 @@ DEPENDS+= ${PYDEPENDENCY}
. endif
.endif
+PYTHONBIN= ${LOCALBASE}/bin/python${PYVERSSUFFIX}
+
+.if exists(${PYTHONBIN})
+PYINC!= ${PYTHONBIN} -c "import distutils.sysconfig; \
+ print distutils.sysconfig.get_python_inc(0, \"\")" || ${ECHO} ""
+PYLIB!= ${PYTHONBIN} -c "import distutils.sysconfig; \
+ print distutils.sysconfig.get_python_lib(0, 1, \"\")" || ${ECHO} ""
+PYSITELIB!= ${PYTHONBIN} -c "import distutils.sysconfig; \
+ print distutils.sysconfig.get_python_lib(0, 0, \"\")" || ${ECHO} ""
+.endif
+
.endif # PYTHON_PYVERSION_MK