diff options
Diffstat (limited to 'mk/install')
| -rw-r--r-- | mk/install/bsd.install.mk | 6 | ||||
| -rw-r--r-- | mk/install/replace.mk | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/mk/install/bsd.install.mk b/mk/install/bsd.install.mk index 014f2f65e25..21a7790e37b 100644 --- a/mk/install/bsd.install.mk +++ b/mk/install/bsd.install.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.install.mk,v 1.14 2013/05/23 13:18:56 obache Exp $ +# $NetBSD: bsd.install.mk,v 1.15 2014/12/06 23:28:18 agc Exp $ # # This Makefile fragment is included by bsd.pkg.mk and provides all # variables and targets related to installing packages. @@ -24,8 +24,10 @@ _COOKIE.install= ${WRKDIR}/.install_done .PHONY: install .if ${_USE_DESTDIR} == "no" install: stage-install -.else +.elif ${_KEEP_BIN_PKGS} == "no" install: stage-package-install +.else +install: package-install .endif ###################################################################### diff --git a/mk/install/replace.mk b/mk/install/replace.mk index 41a1ab6c929..308a578d69f 100644 --- a/mk/install/replace.mk +++ b/mk/install/replace.mk @@ -1,4 +1,4 @@ -# $NetBSD: replace.mk,v 1.15 2013/05/23 13:18:56 obache Exp $ +# $NetBSD: replace.mk,v 1.16 2014/12/06 23:28:18 agc Exp $ # # Public targets: # @@ -27,8 +27,10 @@ .if ${_USE_DESTDIR} == "no" _REPLACE_TARGETS+= ${_PKGSRC_BUILD_TARGETS} -.else +.elif ${_KEEP_BIN_PKGS} == "no" _REPLACE_TARGETS+= stage-package-create +.else +_REPLACE_TARGETS+= package .endif _REPLACE_TARGETS+= replace-message _REPLACE_TARGETS+= unprivileged-install-hook |