diff options
| author | jlam <jlam@pkgsrc.org> | 2006-06-07 17:44:29 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2006-06-07 17:44:29 +0000 |
| commit | 377d2c27f2e649f829149d7be80f30912ab95d71 (patch) | |
| tree | 9f816740eb37d39f629635a73c58be277e0393ae /mk | |
| parent | aa012e72aa84ad5cf2b9c243d86b6af488e9d411 (diff) | |
| download | pkgsrc-377d2c27f2e649f829149d7be80f30912ab95d71.tar.gz | |
Move _ZERO_FILESIZE_P ftom bsd.pkginstall.mk to bsd.pkg.mk so it can more
clearly be used in other modules.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 7 | ||||
| -rw-r--r-- | mk/pkginstall/bsd.pkginstall.mk | 7 |
2 files changed, 7 insertions, 7 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 6e4f9c2d1d4..124c85d2e85 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1844 2006/06/07 17:00:03 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1845 2006/06/07 17:44:29 jlam Exp $ # # This file is in the public domain. # @@ -284,6 +284,11 @@ BUILD_DEFS+= PKG_OPTIONS PKG_FAIL_REASON+= "DEPOT_SUBDIR may not be empty." .endif +# This is a command that exits with a zero status if the given file +# is zero-length, e.g. if ${_ZERO_FILESIZE_P} $$file; then ...; fi +# +_ZERO_FILESIZE_P= ${AWK} 'END { exit NR ? 1 : 0; }' + # Automatically increase process limit where necessary for building. _ULIMIT_CMD= ${UNLIMIT_RESOURCES:@_lim_@${ULIMIT_CMD_${_lim_}};@} diff --git a/mk/pkginstall/bsd.pkginstall.mk b/mk/pkginstall/bsd.pkginstall.mk index b2c48836178..0d81f898211 100644 --- a/mk/pkginstall/bsd.pkginstall.mk +++ b/mk/pkginstall/bsd.pkginstall.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkginstall.mk,v 1.6 2006/06/06 19:49:52 jlam Exp $ +# $NetBSD: bsd.pkginstall.mk,v 1.7 2006/06/07 17:44:29 jlam Exp $ # # This Makefile fragment is included by bsd.pkg.mk and implements the # common INSTALL/DEINSTALL scripts framework. To use the pkginstall @@ -20,11 +20,6 @@ _FUNC_STRIP_PREFIX= \ }' s="$$1" prefix=${PREFIX:Q}/ /dev/null; \ } -# This is a command that exits with a zero status if the given file -# is zero-length. -# -_ZERO_FILESIZE_P= ${AWK} 'END { exit NR ? 1 : 0; }' - _PKGINSTALL_DIR= ${WRKDIR}/.pkginstall # XXX This should not be duplicated from the install module, but we |