diff options
| author | jlam <jlam@pkgsrc.org> | 2007-08-10 04:00:43 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2007-08-10 04:00:43 +0000 |
| commit | 6ea0c2868e54502f4ba4877dbceaf8a35cca496a (patch) | |
| tree | f5ec2d4d2a44f28e161664f6f559c5ab716227f3 /mk | |
| parent | 605292a86d8ddc478b7c79174f18649615c4f3df (diff) | |
| download | pkgsrc-6ea0c2868e54502f4ba4877dbceaf8a35cca496a.tar.gz | |
Remove ${WRKDIR}/.pkgdb during "install-clean" as that directory
contains files that are generated during the "install" phase. This
should fix the problem where PLIST modifications were ignored if the
PLIST was modified between a "make deinstall" and a "make reinstall".
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/flavor/pkg/install.mk | 7 | ||||
| -rw-r--r-- | mk/install/install.mk | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/mk/flavor/pkg/install.mk b/mk/flavor/pkg/install.mk index 0f246d3468c..e813b027939 100644 --- a/mk/flavor/pkg/install.mk +++ b/mk/flavor/pkg/install.mk @@ -1,4 +1,4 @@ -# $NetBSD: install.mk,v 1.10 2007/05/22 16:17:16 joerg Exp $ +# $NetBSD: install.mk,v 1.11 2007/08/10 04:00:43 jlam Exp $ # # _flavor-check-conflicts: # Checks for conflicts between the package and installed packages. @@ -15,6 +15,9 @@ # Populates the package database with the appropriate entries to # register the package as being installed on the system. # +# _flavor-install-clean: +# Removes the state files from the run of an ``install'' target. +# _flavor-check-conflicts: .PHONY error-check ${_PKG_SILENT}${_PKG_DEBUG}${RM} -f ${WRKDIR}/.CONFLICTS @@ -66,3 +69,5 @@ _flavor-register: .PHONY generate-metadata ${_RDEPENDS_FILE} esac ${_PKG_SILENT}${_PKG_DEBUG}${_FULL_DEPENDS_CMD} | \ ${SORT} -u | ${_REGISTER_DEPENDENCIES} ${PKGNAME} + +_flavor-install-clean: .PHONY clean-metadata diff --git a/mk/install/install.mk b/mk/install/install.mk index 58fa17ca92b..8892d9f746d 100644 --- a/mk/install/install.mk +++ b/mk/install/install.mk @@ -1,4 +1,4 @@ -# $NetBSD: install.mk,v 1.43 2007/07/02 14:54:10 joerg Exp $ +# $NetBSD: install.mk,v 1.44 2007/08/10 04:00:43 jlam Exp $ # # This file provides the code for the "install" phase. # @@ -332,7 +332,7 @@ privileged-install-hook: .PHONY ### install-clean removes the state files for the "install" and ### later phases so that the "install" target may be re-invoked. ### -install-clean: .PHONY package-clean check-clean +install-clean: .PHONY package-clean check-clean _flavor-install-clean ${RUN} ${RM} -f ${PLIST} ${_COOKIE.install} ###################################################################### |