pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang/python Move PY_NO_EGG?= check outside of defined(...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/b2245d1d9542
branches:  trunk
changeset: 543986:b2245d1d9542
user:      abs <abs%pkgsrc.org@localhost>
date:      Mon Jun 30 13:41:05 2008 +0000

description:
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:

 lang/python/extension.mk |  14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diffs (35 lines):

diff -r 27726686b12e -r b2245d1d9542 lang/python/extension.mk
--- a/lang/python/extension.mk  Mon Jun 30 12:44:17 2008 +0000
+++ b/lang/python/extension.mk  Mon Jun 30 13:41:05 2008 +0000
@@ -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 @@
 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 @@
         ${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



Home | Main Index | Thread Index | Old Index