From 58d8656835bc9adae9cab8b0cbb9b253a7acfcbb Mon Sep 17 00:00:00 2001 From: erh Date: Thu, 9 Dec 2004 21:29:06 +0000 Subject: Explicitly override the update target to cause the deinstall step to happen after the package is built. This is necessary because the pkg_delete binary that is used is the one from the WRKDIR, not the installed one. --- pkgtools/pkg_install/Makefile | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'pkgtools/pkg_install') diff --git a/pkgtools/pkg_install/Makefile b/pkgtools/pkg_install/Makefile index a45c20d564a..4d7709e8f4d 100644 --- a/pkgtools/pkg_install/Makefile +++ b/pkgtools/pkg_install/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.105 2004/11/02 00:10:15 erh Exp $ +# $NetBSD: Makefile,v 1.106 2004/12/09 21:29:06 erh Exp $ # Notes to package maintainers: # @@ -71,6 +71,14 @@ post-install: ${PKG_ADMIN} rebuild; \ fi +# XXX Reverse the order that update does things since +# XXX we need pkg_delete built before we can deinstall. +# XXX This should probably be the default order for all packages. +update: + ${MAKE} + ${MAKE} deinstall UPDATE_RUNNING=YES + ${MAKE} install + .include "../../pkgtools/libnbcompat/inplace.mk" .include "../../mk/bsd.pkg.mk" -- cgit v1.2.3