pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/lang/python Make EGG_INFODIR available for use in Make...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/bae9b48fac53
branches:  trunk
changeset: 642873:bae9b48fac53
user:      rodent <rodent%pkgsrc.org@localhost>
date:      Sat Dec 06 15:17:08 2014 +0000

description:
Make EGG_INFODIR available for use in Makefiles. Clarify comment regarding
necessity of substituting EGG_NAME in PLISTs.

diffstat:

 lang/python/egg.mk |  12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diffs (35 lines):

diff -r 08e7be4f1d6a -r bae9b48fac53 lang/python/egg.mk
--- a/lang/python/egg.mk        Sat Dec 06 11:00:52 2014 +0000
+++ b/lang/python/egg.mk        Sat Dec 06 15:17:08 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: egg.mk,v 1.17 2014/01/26 00:41:07 wiz Exp $
+# $NetBSD: egg.mk,v 1.18 2014/12/06 15:17:08 rodent Exp $
 #
 # Common logic to handle Python Eggs
 #
@@ -10,6 +10,7 @@
 # which creates an egg-info file; those should use distutils.mk
 
 EGG_NAME?=     ${DISTNAME}
+EGG_INFODIR?=  ${EGG_NAME}-py${PYVERSSUFFIX}.egg-info
 
 PYDISTUTILSPKG=        yes
 PY_PATCHPLIST= yes
@@ -20,12 +21,13 @@
 # the egg information in an egg comprises multiple files in an
 # egg-info directory.
 
-# XXX The PLIST substitution of EGG_NAME does not appear to be
-# necessary.  Either it should be removed or a comment added
-# explaining why it is necessary.
+# The PLIST substitution of EGG_NAME is not necessary. However, it
+# is convenient. See lang/ruby/gem.mk and PLIST files for ruby gem
+# packages to understand other examples of this feature in non-python
+# packages.
 
 PLIST_SUBST+=  EGG_NAME=${EGG_NAME}-py${PYVERSSUFFIX}
-PLIST_SUBST+=  EGG_INFODIR=${EGG_NAME}-py${PYVERSSUFFIX}.egg-info
+PLIST_SUBST+=  EGG_INFODIR=${EGG_INFODIR}
 PRINT_PLIST_AWK+=      { gsub(/${EGG_NAME}-py${PYVERSSUFFIX}.egg-info/, \
                               "$${EGG_INFODIR}") }
 PRINT_PLIST_AWK+=      { gsub(/${EGG_NAME}-py${PYVERSSUFFIX}-nspkg.pth/, \



Home | Main Index | Thread Index | Old Index