diff options
| author | erh <erh@pkgsrc.org> | 2004-12-09 21:29:06 +0000 |
|---|---|---|
| committer | erh <erh@pkgsrc.org> | 2004-12-09 21:29:06 +0000 |
| commit | 8ad80bab7d517fc3dad12a576834d0327f14d94d (patch) | |
| tree | 441b73ef2fc73cc1923d275250043f9126dfea38 /pkgtools | |
| parent | 2bd7a0378aca922ba732ff8c99f3ffb809635c63 (diff) | |
| download | pkgsrc-8ad80bab7d517fc3dad12a576834d0327f14d94d.tar.gz | |
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.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkg_install/Makefile | 10 |
1 files changed, 9 insertions, 1 deletions
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" |