diff options
| author | agc <agc> | 2001-05-23 09:18:26 +0000 |
|---|---|---|
| committer | agc <agc> | 2001-05-23 09:18:26 +0000 |
| commit | 6d28e7ce1f8ec1da973bc00ef13fa99da82e3b13 (patch) | |
| tree | f6967e9bce81f818d07fa39844b1b949836e23e2 /mk/bsd.pkg.mk | |
| parent | ca08977e435389660950f8ff8e0a8401ea4c9ffb (diff) | |
| download | pkgsrc-6d28e7ce1f8ec1da973bc00ef13fa99da82e3b13.tar.gz | |
Use full pathname for xargs, since it isn't a builtin.
Diffstat (limited to 'mk/bsd.pkg.mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 3e1ffc7a5e0..1d604970ef8 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.745 2001/05/22 11:43:36 agc Exp $ +# $NetBSD: bsd.pkg.mk,v 1.746 2001/05/23 09:18:26 agc Exp $ # # This file is in the public domain. # @@ -600,7 +600,7 @@ TOUCH?= /usr/bin/touch TR?= /usr/bin/tr TRUE?= /usr/bin/true TYPE?= /usr/bin/type -XARGS?= xargs +XARGS?= /usr/bin/xargs .elif (${OPSYS} == "Linux") AWK?= /usr/bin/awk BASENAME?= /bin/basename @@ -645,7 +645,7 @@ TOUCH?= /bin/touch TR?= /usr/bin/tr TRUE?= /bin/true TYPE?= type -XARGS?= xargs -r +XARGS?= /usr/bin/xargs -r .else AWK?= /usr/bin/awk BASENAME?= /usr/bin/basename @@ -690,7 +690,7 @@ TOUCH?= /usr/bin/touch TR?= /usr/bin/tr TRUE?= true # Shell builtin TYPE?= type # Shell builtin -XARGS?= xargs +XARGS?= /usr/bin/xargs .endif # !SunOS PKG_ADD?= PKG_DBDIR=${PKG_DBDIR} ${PKG_TOOLS_BIN}/pkg_add @@ -2103,7 +2103,8 @@ do-su-install: case "$$extractname" in \ "") ${ECHO_MSG} "*** Warning: ${WRKDIR} may contain an older version of ${PKGBASE}" ;; \ "${PKGNAME}") ;; \ - *) ${ECHO_MSG} "*** Error: Package version $$extractname in ${WRKDIR}, current version ${PKGNAME} in pkgsrc directory"; \ + *) ${ECHO_MSG} "*** Error: Package version $$extractname in ${WRKDIR}"; \ + ${ECHO_MSG} "*** Current version ${PKGNAME} in pkgsrc directory"; \ ${ECHO_MSG} "*** Please rebuild the package using the newer version: \"make clean && make\""; \ exit 1 ;; \ esac |