From 49f6b8a4697e7a8356fcf8f8335c5467c396be03 Mon Sep 17 00:00:00 2001 From: joerg Date: Thu, 2 Jul 2009 09:37:12 +0000 Subject: Restore PRINT_PLIST_AWK logic in so far they don't create @dirrm entries. I pruned them too aggressively as the @dirrm matching here was conditional. OK wiz --- lang/python/pyversion.mk | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'lang/python') diff --git a/lang/python/pyversion.mk b/lang/python/pyversion.mk index 5173117e800..ae45ab50988 100644 --- a/lang/python/pyversion.mk +++ b/lang/python/pyversion.mk @@ -1,4 +1,4 @@ -# $NetBSD: pyversion.mk,v 1.71 2009/06/14 22:58:03 joerg Exp $ +# $NetBSD: pyversion.mk,v 1.72 2009/07/02 09:37:12 joerg Exp $ # This file determines which Python version is used as a dependency for # a package. @@ -164,6 +164,16 @@ 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} "" + +PRINT_PLIST_AWK+= /^${PYINC:S|/|\\/|g}/ \ + { gsub(/${PYINC:S|/|\\/|g}/, "$${PYINC}"); \ + print; next; } +PRINT_PLIST_AWK+= /^${PYSITELIB:S|/|\\/|g}/ \ + { gsub(/${PYSITELIB:S|/|\\/|g}/, "$${PYSITELIB}"); \ + print; next; } +PRINT_PLIST_AWK+= /^${PYLIB:S|/|\\/|g}/ \ + { gsub(/${PYLIB:S|/|\\/|g}/, "$${PYLIB}"); \ + print; next; } .endif ALL_ENV+= PYTHON=${PYTHONBIN} -- cgit v1.2.3