diff options
| author | jlam <jlam> | 2006-07-07 13:39:52 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2006-07-07 13:39:52 +0000 |
| commit | 1c44fe622f3d6837a18c50688aaba9f562a9d261 (patch) | |
| tree | f65fc45582c297611556f7ab1df2e6daa55983ff /mk | |
| parent | daa322993abcdb5770ca3e48f96d5182eda858d8 (diff) | |
| download | pkgsrc-1c44fe622f3d6837a18c50688aaba9f562a9d261.tar.gz | |
Make configure, install, and package barrier-aware even if NO_CONFIGURE,
NO_INSTALL, or NO_PACKAGE are defined.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/configure/bsd.configure.mk | 6 | ||||
| -rw-r--r-- | mk/install/bsd.install.mk | 6 | ||||
| -rw-r--r-- | mk/package/bsd.package.mk | 6 |
3 files changed, 12 insertions, 6 deletions
diff --git a/mk/configure/bsd.configure.mk b/mk/configure/bsd.configure.mk index fba595a90bc..46da9d1bcff 100644 --- a/mk/configure/bsd.configure.mk +++ b/mk/configure/bsd.configure.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.configure.mk,v 1.4 2006/07/06 22:29:52 jlam Exp $ +# $NetBSD: bsd.configure.mk,v 1.5 2006/07/07 13:39:52 jlam Exp $ # # This Makefile fragment is included by bsd.pkg.mk and provides all # variables and targets related to configuring packages for building. @@ -26,8 +26,10 @@ _CONFIGURE_COOKIE= ${WRKDIR}/.configure_done . if exists(${_CONFIGURE_COOKIE}) configure: @${DO_NADA} -. else +. elif exists(${_BARRIER_COOKIE}) configure: wrapper configure-cookie +. else +configure: barrier . endif .endif diff --git a/mk/install/bsd.install.mk b/mk/install/bsd.install.mk index ecae846f7d4..00aaa557fe1 100644 --- a/mk/install/bsd.install.mk +++ b/mk/install/bsd.install.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.install.mk,v 1.6 2006/07/06 22:29:52 jlam Exp $ +# $NetBSD: bsd.install.mk,v 1.7 2006/07/07 13:39:52 jlam Exp $ # # This Makefile fragment is included by bsd.pkg.mk and provides all # variables and targets related to installing packages. @@ -26,8 +26,10 @@ _INSTALL_COOKIE= ${WRKDIR}/.install_done . if exists(${_INSTALL_COOKIE}) install: @${DO_NADA} -. else +. elif exists(${_BARRIER_COOKIE}) install: ${_PKGSRC_BUILD_TARGETS} install-cookie +. else +install: barrier . endif .endif diff --git a/mk/package/bsd.package.mk b/mk/package/bsd.package.mk index 047a71ead55..1c89941f234 100644 --- a/mk/package/bsd.package.mk +++ b/mk/package/bsd.package.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.package.mk,v 1.4 2006/07/05 22:21:03 jlam Exp $ +# $NetBSD: bsd.package.mk,v 1.5 2006/07/07 13:39:52 jlam Exp $ # # This Makefile fragment is included by bsd.pkg.mk and provides all # variables and targets related to binary packages. @@ -22,13 +22,15 @@ _PACKAGE_COOKIE= ${WRKDIR}/.package_done . if exists(${_PACKAGE_COOKIE}) package: @${DO_NADA} -. else +. elif exists(${_BARRIER_COOKIE}) package: install . if defined(SKIP_SILENT) @${DO_NADA} . else @${PHASE_MSG} "${PKGNAME} may not be packaged: "${NO_PACKAGE:Q}"." . endif +. else +package: barrier . endif .endif |