diff options
| author | agc <agc> | 2001-10-26 14:09:59 +0000 |
|---|---|---|
| committer | agc <agc> | 2001-10-26 14:09:59 +0000 |
| commit | 413aeecacaaf5d23de6324803da96b7827f553ce (patch) | |
| tree | b205911a0374704e6a0378d88ec3a73be474ef3f /mk | |
| parent | 45aacf270ab31d90097aeda2ff6652d63d3dd016 (diff) | |
| download | pkgsrc-413aeecacaaf5d23de6324803da96b7827f553ce.tar.gz | |
At present, if there is a pre-<target> or post-<target> script in
the scripts/ directory, it will be run automatically as part of
the build process, by bsd.pkg.mk. There are now exactly 5 packages
in pkgsrc which use this facility, and yet, for every package build,
the existence of a script is checked by bsd.pkg.mk once before the
target is executed, and once afterwards. This incurs needless
overhead.
Move the separate pre- and post- script handling out of bsd.pkg.mk into
the individual package Makefiles, where it's much more obvious what is
happening, anyway.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index c31e2291e6a..151489d979f 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.831 2001/10/26 13:57:58 skrll Exp $ +# $NetBSD: bsd.pkg.mk,v 1.832 2001/10/26 14:09:59 agc Exp $ # # This file is in the public domain. # @@ -1627,16 +1627,8 @@ _PORT_USE: .USE ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${MAKE} ${MAKEFLAGS} install-depends DEPENDS_TARGET=${DEPENDS_TARGET} .endif ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKEFLAGS} ${.TARGET:S/^real-/pre-/} - ${_PKG_SILENT}${_PKG_DEBUG}if [ -f ${SCRIPTDIR}/${.TARGET:S/^real-/pre-/} ]; then \ - cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} \ - ${SCRIPTDIR}/${.TARGET:S/^real-/pre-/}; \ - fi ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKEFLAGS} ${.TARGET:S/^real-/do-/} ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKEFLAGS} ${.TARGET:S/^real-/post-/} - ${_PKG_SILENT}${_PKG_DEBUG}if [ -f ${SCRIPTDIR}/${.TARGET:S/^real-/post-/} ]; then \ - cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} \ - ${SCRIPTDIR}/${.TARGET:S/^real-/post-/}; \ - fi .if !make(real-fetch) \ && (!make(real-package) || !defined(PACKAGE_NOINSTALL)) ${_PKG_SILENT}${_PKG_DEBUG} \ |