summaryrefslogtreecommitdiff
path: root/mk/install
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2007-03-02 05:54:18 +0000
committerwiz <wiz@pkgsrc.org>2007-03-02 05:54:18 +0000
commitfc3f7b9811fe0899c45f39c75372dd8ae8750bf4 (patch)
tree4f0225a9b75328a4836f914a72792a613a27adc3 /mk/install
parent0f5cbf8ae398c5af8b8efe36992dea12eba17607 (diff)
downloadpkgsrc-fc3f7b9811fe0899c45f39c75372dd8ae8750bf4.tar.gz
Remove support for obsolete and unused NO_PKG_REGISTER.
Diffstat (limited to 'mk/install')
-rw-r--r--mk/install/install.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/mk/install/install.mk b/mk/install/install.mk
index 4a6d80bbab2..63f17a892c5 100644
--- a/mk/install/install.mk
+++ b/mk/install/install.mk
@@ -1,4 +1,4 @@
-# $NetBSD: install.mk,v 1.32 2007/01/06 20:15:26 rillig Exp $
+# $NetBSD: install.mk,v 1.33 2007/03/02 05:54:18 wiz Exp $
#
# This file provides the code for the "install" phase.
#
@@ -137,7 +137,7 @@ release-install-localbase-lock: release-localbase-lock
.if ${_USE_DESTDIR} != "user-destdir"
_INSTALL_ALL_TARGETS+= acquire-install-localbase-lock
.endif
-.if !defined(NO_PKG_REGISTER) && !defined(FORCE_PKG_REGISTER) && ${_USE_DESTDIR} == "no"
+.if !defined(FORCE_PKG_REGISTER) && ${_USE_DESTDIR} == "no"
_INSTALL_ALL_TARGETS+= install-check-conflicts
_INSTALL_ALL_TARGETS+= install-check-installed
.endif
@@ -164,7 +164,7 @@ _INSTALL_ALL_TARGETS+= check-files-post
.if ${_USE_DESTDIR} == "no"
_INSTALL_ALL_TARGETS+= post-install-script
.endif
-.if !defined(NO_PKG_REGISTER) && ${_USE_DESTDIR} == "no"
+.if ${_USE_DESTDIR} == "no"
_INSTALL_ALL_TARGETS+= register-pkg
.endif
_INSTALL_ALL_TARGETS+= privileged-install-hook