diff options
author | rillig <rillig> | 2007-03-09 00:39:54 +0000 |
---|---|---|
committer | rillig <rillig> | 2007-03-09 00:39:54 +0000 |
commit | 0402c41d9a392b7e354ff586322b9206f37bd5f1 (patch) | |
tree | 008807eeeda864fdd459d9968b98336e030621b9 /mk/install | |
parent | 432eca22ebea1d2978961ec08c411cb7adb727f2 (diff) | |
download | pkgsrc-0402c41d9a392b7e354ff586322b9206f37bd5f1.tar.gz |
Renamed some more flavor-specific targets to have the form _flavor-*.
Split check-vulnerable into a general an a flavor-specific part, for
consistence with all the other targets.
Diffstat (limited to 'mk/install')
-rw-r--r-- | mk/install/deinstall.mk | 15 | ||||
-rw-r--r-- | mk/install/install.mk | 47 |
2 files changed, 7 insertions, 55 deletions
diff --git a/mk/install/deinstall.mk b/mk/install/deinstall.mk index 40e67142409..a51b1daab6d 100644 --- a/mk/install/deinstall.mk +++ b/mk/install/deinstall.mk @@ -1,4 +1,4 @@ -# $NetBSD: deinstall.mk,v 1.7 2006/11/03 08:04:06 joerg Exp $ +# $NetBSD: deinstall.mk,v 1.8 2007/03/09 00:39:55 rillig Exp $ # DEINSTALLDEPENDS controls whether dependencies and dependents are also # removed when a package is de-installed. The valid values are: @@ -22,7 +22,7 @@ deinstall: su-target .endif _SU_DEINSTALL_TARGETS= acquire-deinstall-lock -_SU_DEINSTALL_TARGETS+= deinstall-pkg +_SU_DEINSTALL_TARGETS+= _flavor-deinstall _SU_DEINSTALL_TARGETS+= release-deinstall-lock .if ${_USE_DESTDIR} == "no" _SU_DEINSTALL_TARGETS+= install-clean @@ -45,14 +45,3 @@ MAKEFLAGS.su-deinstall= DEINSTALLDEPENDS=${DEINSTALLDEPENDS} .if !target(reinstall) reinstall: install-clean install .endif - -###################################################################### -### deinstall-pkg (PRIVATE, override) -###################################################################### -### deinstall-pkg removes the package from the system. This should -### be overridden per package system flavor. -### -.if !target(deinstall-pkg) -deinstall-pkg: - @${DO_NADA} -.endif diff --git a/mk/install/install.mk b/mk/install/install.mk index cb85ba0fe02..c9e0ee4c65e 100644 --- a/mk/install/install.mk +++ b/mk/install/install.mk @@ -1,4 +1,4 @@ -# $NetBSD: install.mk,v 1.35 2007/03/02 09:08:33 wiz Exp $ +# $NetBSD: install.mk,v 1.36 2007/03/09 00:39:55 rillig Exp $ # # This file provides the code for the "install" phase. # @@ -138,8 +138,8 @@ release-install-localbase-lock: release-localbase-lock _INSTALL_ALL_TARGETS+= acquire-install-localbase-lock .endif .if ${_USE_DESTDIR} == "no" -_INSTALL_ALL_TARGETS+= install-check-conflicts -_INSTALL_ALL_TARGETS+= install-check-installed +_INSTALL_ALL_TARGETS+= _flavor-check-conflicts +_INSTALL_ALL_TARGETS+= _flavor-check-installed .endif _INSTALL_ALL_TARGETS+= install-check-umask .if empty(CHECK_FILES:M[nN][oO]) && !empty(CHECK_FILES_SUPPORTED:M[Yy][Ee][Ss]) @@ -165,7 +165,7 @@ _INSTALL_ALL_TARGETS+= check-files-post _INSTALL_ALL_TARGETS+= post-install-script .endif .if ${_USE_DESTDIR} == "no" -_INSTALL_ALL_TARGETS+= register-pkg +_INSTALL_ALL_TARGETS+= _flavor-register .endif _INSTALL_ALL_TARGETS+= privileged-install-hook .if ${_USE_DESTDIR} != "user-destdir" @@ -182,32 +182,6 @@ install-all: su-install-all su-install-all: ${_INSTALL_ALL_TARGETS} ###################################################################### -### install-check-conflicts (PRIVATE, override) -###################################################################### -### install-check-conflicts check for conflicts between the package and -### any installed packages. This should be overridden per package -### system flavor. -### -.PHONY: install-check-conflicts -.if !target(install-check-conflicts) -install-check-conflicts: - @${DO_NADA} -.endif - -###################################################################### -### install-check-installed (PRIVATE, override) -###################################################################### -### install-check-installed checks if the package (perhaps an older -### version) is already installed on the system. This should be -### overridden per package system flavor. -### -.PHONY: install-check-installed -.if !target(install-check-installed) -install-check-installed: - @${DO_NADA} -.endif - -###################################################################### ### install-check-umask (PRIVATE) ###################################################################### ### install-check-umask tests whether the umask is properly set and @@ -352,17 +326,6 @@ install-doc-handling: plist ${_PKG_SILENT}${_PKG_DEBUG}${CAT} ${PLIST} | ${GREP} -v "^@" | \ ${EGREP} ${_PLIST_REGEXP.man:Q} | ${_DOC_COMPRESS} -###################################################################### -### register-pkg (PRIVATE, override) -###################################################################### -### register-pkg registers the package as being installed on the system. -### -.PHONY: register-pkg -.if !target(register-pkg) -register-pkg: - @${DO_NADA} -.endif - privileged-install-hook: .PHONY @${DO_NADA} @@ -381,5 +344,5 @@ install-clean: package-clean check-clean ### bootstrap-register registers "bootstrap" packages that are installed ### by the pkgsrc/bootstrap/bootstrap script. ### -bootstrap-register: register-pkg clean +bootstrap-register: _flavor-register clean @${DO_NADA} |