diff options
| author | joerg <joerg> | 2016-04-10 16:39:27 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2016-04-10 16:39:27 +0000 |
| commit | 9fa8458dad52bc1ef2d63f9e6a454a52a4511e3c (patch) | |
| tree | ea1bcebaf94574f134b87b95b393c7c2a0a9b785 /lang/python | |
| parent | c07de7ab291f82a7dd8c47367dd507bef7f8ff1e (diff) | |
| download | pkgsrc-9fa8458dad52bc1ef2d63f9e6a454a52a4511e3c.tar.gz | |
Adjust checks for _USE_DESTDIR != no or incorrect references to
USE_DESTDIR.
Diffstat (limited to 'lang/python')
| -rw-r--r-- | lang/python/egg.mk | 5 | ||||
| -rw-r--r-- | lang/python/extension.mk | 4 |
2 files changed, 2 insertions, 7 deletions
diff --git a/lang/python/egg.mk b/lang/python/egg.mk index 5da8dd6836e..a93ae10a197 100644 --- a/lang/python/egg.mk +++ b/lang/python/egg.mk @@ -1,4 +1,4 @@ -# $NetBSD: egg.mk,v 1.20 2014/12/31 13:57:28 wiz Exp $ +# $NetBSD: egg.mk,v 1.21 2016/04/10 16:39:28 joerg Exp $ # # Common logic to handle Python Eggs # @@ -34,9 +34,6 @@ PRINT_PLIST_AWK+= { gsub(/${EGG_NAME}-py${PYVERSSUFFIX}-nspkg.pth/, \ "$${EGG_NAME}-nspkg.pth") } _PYSETUPTOOLSINSTALLARGS= --single-version-externally-managed -.if ${_USE_DESTDIR} == "no" -_PYSETUPTOOLSINSTALLARGS+= --root=/ -.endif DEPENDS+= ${PYPKGPREFIX}-setuptools>=0.8:../../devel/py-setuptools diff --git a/lang/python/extension.mk b/lang/python/extension.mk index 92305a74b04..bbb7514bc5a 100644 --- a/lang/python/extension.mk +++ b/lang/python/extension.mk @@ -1,4 +1,4 @@ -# $NetBSD: extension.mk,v 1.41 2015/12/27 21:08:45 wiz Exp $ +# $NetBSD: extension.mk,v 1.42 2016/04/10 16:39:28 joerg Exp $ .include "../../lang/python/pyversion.mk" @@ -21,9 +21,7 @@ PYSETUPARGS?= #empty PYSETUPINSTALLARGS?= #empty PYSETUPOPTARGS?= -c -O1 _PYSETUPINSTALLARGS= ${PYSETUPINSTALLARGS} ${PYSETUPOPTARGS} ${_PYSETUPTOOLSINSTALLARGS} -.if ${_USE_DESTDIR} != "no" _PYSETUPINSTALLARGS+= --root=${DESTDIR:Q} -.endif PY_PATCHPLIST?= yes PYSETUPINSTALLARGS?= #empty PYSETUPTESTTARGET?= test |