diff options
| author | Alexander Botero-Lowry <alexbl@FreeBSD.org> | 2007-07-31 16:28:32 +0000 |
|---|---|---|
| committer | Alexander Botero-Lowry <alexbl@FreeBSD.org> | 2007-07-31 16:28:32 +0000 |
| commit | 923bd8b2f8423fa978342f97fe6b23dfe9d3688e (patch) | |
| tree | ed71c996362323a6f1b7ef56484a995456cd5929 | |
| parent | . Better fix. Just use 'short' variables and be done with it. The (diff) | |
- use PORTUPGRADE_CMD instead of PORTUPGRADE so as not to confict with the
portupgrade env variable
Pointed out by: Miroslav Lachman <000.fbsd@quip.cz>
Notes
Notes:
svn path=/head/; revision=196840
| -rw-r--r-- | lang/python/Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lang/python/Makefile b/lang/python/Makefile index 3b3a59fc5dd3..b9625efee776 100644 --- a/lang/python/Makefile +++ b/lang/python/Makefile @@ -24,10 +24,10 @@ do-install: @${DO_NADA} # Major upgrade support -PORTUPGRADE?= ${LOCALBASE}/sbin/portupgrade -PKG_WHICH?= ${LOCALBASE}/sbin/pkg_which +PORTUPGRADE_CMD?= ${LOCALBASE}/sbin/portupgrade +PKG_WHICH_CMD?= ${LOCALBASE}/sbin/pkg_which upgrade-site-packages: - @if [ ! -x ${PORTUPGRADE} ]; then \ + @if [ ! -x ${PORTUPGRADE_CMD} ]; then \ ${ECHO_MSG} "Please install ports-mgmt/portupgrade."; \ ${FALSE}; \ fi @@ -36,12 +36,12 @@ upgrade-site-packages: if [ -d ${PREFIX}/lib/python$$ver ]; then \ UPD=`${FIND} ${PREFIX}/lib/python$$ver \ -type f -print0 | \ - ${XARGS} -0 ${PKG_WHICH} | \ + ${XARGS} -0 ${PKG_WHICH_CMD} | \ ${GREP} -Fv '?' | \ ${EGREP} -v '^python2?[0-5]?-2' | \ ${SORT} -u`; \ if [ "$$UPD" ]; then \ - ${PORTUPGRADE} -f $$UPD; \ + ${PORTUPGRADE_CMD} -f $$UPD; \ fi; \ fi; \ done \ |