summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorabs <abs@pkgsrc.org>2008-06-30 13:41:05 +0000
committerabs <abs@pkgsrc.org>2008-06-30 13:41:05 +0000
commit7ebc8f21050e3978ab0902a8dad4fef1d2006465 (patch)
treec633cb4eafa2f5db8a2103b363c9d36543b151cb /lang
parent5b12c368cbe75685f921cb7b5a3c9469f7260ebc (diff)
downloadpkgsrc-7ebc8f21050e3978ab0902a8dad4fef1d2006465.tar.gz
Move PY_NO_EGG?= check outside of defined(PYDISTUTILSPKG) to fix
PLIST of ap22-py25-python and similar packages (removes additional egg-info file) From tnn@. Passed via packages@ without objection
Diffstat (limited to 'lang')
-rw-r--r--lang/python/extension.mk14
1 files changed, 7 insertions, 7 deletions
diff --git a/lang/python/extension.mk b/lang/python/extension.mk
index 45d6967ca09..9f61bacf6c3 100644
--- a/lang/python/extension.mk
+++ b/lang/python/extension.mk
@@ -1,4 +1,4 @@
-# $NetBSD: extension.mk,v 1.18 2008/04/24 01:39:25 tnn Exp $
+# $NetBSD: extension.mk,v 1.19 2008/06/30 13:41:05 abs Exp $
# derive a python version from the package name if possible
# optionally handled quoted package names
@@ -28,12 +28,6 @@ _PYSETUPINSTALLARGS+= --root=${DESTDIR:Q}
PY_PATCHPLIST?= yes
PYSETUPSUBDIR?= #empty
-PY_NO_EGG?= yes
-.if !empty(PY_NO_EGG:M[yY][eE][sS])
-# see python25/patches/patch-av
-INSTALL_ENV+= PKGSRC_PYTHON_NO_EGG=defined
-.endif
-
do-build:
(cd ${WRKSRC}/${PYSETUPSUBDIR} && ${SETENV} ${MAKE_ENV} ${PYTHONBIN} \
${PYSETUP} build ${PYSETUPBUILDARGS})
@@ -43,6 +37,12 @@ do-install:
${PYTHONBIN} ${PYSETUP} "install" ${_PYSETUPINSTALLARGS})
.endif
+PY_NO_EGG?= yes
+.if !empty(PY_NO_EGG:M[yY][eE][sS])
+# see python25/patches/patch-av
+INSTALL_ENV+= PKGSRC_PYTHON_NO_EGG=defined
+.endif
+
.if defined(PY_PATCHPLIST)
PLIST_SUBST+= PYINC=${PYINC} PYSITELIB=${PYSITELIB}
.endif