diff options
| author | richard <richard@pkgsrc.org> | 2016-08-28 09:40:35 +0000 |
|---|---|---|
| committer | richard <richard@pkgsrc.org> | 2016-08-28 09:40:35 +0000 |
| commit | f760a76b91c6d0541a8f7b36f526d77a3b3029e2 (patch) | |
| tree | e90ebfcabca10afea7d6c0ade1e02c11961ecbca | |
| parent | e9a68711d5374aa76af96b8257fe6603f5dcb3a7 (diff) | |
| download | pkgsrc-f760a76b91c6d0541a8f7b36f526d77a3b3029e2.tar.gz | |
Let print-PLIST generate python version agnostic PYVERSSUFFIX in filenames.
This is somewhat related to the recent PLIST_SUBST commit. Ok'd by wiz@
| -rw-r--r-- | lang/python/distutils.mk | 4 | ||||
| -rw-r--r-- | lang/python/egg.mk | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lang/python/distutils.mk b/lang/python/distutils.mk index 77816f5f4f7..aa8199ec165 100644 --- a/lang/python/distutils.mk +++ b/lang/python/distutils.mk @@ -1,4 +1,4 @@ -# $NetBSD: distutils.mk,v 1.7 2014/12/31 13:57:28 wiz Exp $ +# $NetBSD: distutils.mk,v 1.8 2016/08/28 09:40:35 richard Exp $ # # Common logic for python distributions that use distutils. # @@ -28,5 +28,7 @@ PY_NO_EGG?= no PLIST_SUBST+= EGG_FILE=${EGG_NAME}-py${PYVERSSUFFIX}.egg-info PRINT_PLIST_AWK+= { gsub("${EGG_NAME}-py${PYVERSSUFFIX}.egg-info", \ "$${EGG_FILE}") } +PRINT_PLIST_AWK+= { gsub(/${PYVERSSUFFIX}/, \ + "$${PYVERSSUFFIX}") } .include "../../lang/python/extension.mk" diff --git a/lang/python/egg.mk b/lang/python/egg.mk index d808b16b475..5544d466e54 100644 --- a/lang/python/egg.mk +++ b/lang/python/egg.mk @@ -1,4 +1,4 @@ -# $NetBSD: egg.mk,v 1.23 2016/06/01 09:44:52 wiz Exp $ +# $NetBSD: egg.mk,v 1.24 2016/08/28 09:40:35 richard Exp $ # # Common logic to handle Python Eggs # @@ -32,6 +32,8 @@ PRINT_PLIST_AWK+= { gsub(/${EGG_NAME}-py${PYVERSSUFFIX}.egg-info/, \ "$${EGG_INFODIR}") } PRINT_PLIST_AWK+= { gsub(/${EGG_NAME}-py${PYVERSSUFFIX}-nspkg.pth/, \ "$${EGG_NAME}-nspkg.pth") } +PRINT_PLIST_AWK+= { gsub(/${PYVERSSUFFIX}/, \ + "$${PYVERSSUFFIX}") } _PYSETUPTOOLSINSTALLARGS= --single-version-externally-managed |