diff options
| author | joerg <joerg@pkgsrc.org> | 2007-08-14 23:58:24 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2007-08-14 23:58:24 +0000 |
| commit | 8eae292c51f7db3c58d0fb7424dd3e09f737ff11 (patch) | |
| tree | 9854d3f8c0dccfa11f155aaa3347ce10f456e38e /mk/install | |
| parent | 6a1fd2334fbd1c7d915f51c6da3eb95129808e6a (diff) | |
| download | pkgsrc-8eae292c51f7db3c58d0fb7424dd3e09f737ff11.tar.gz | |
Fix a number of bugs in the DESTDIR support:
- check-perms.mk was not DESTDIR aware, prefix files before passing it
to the directory extraction
- PKG_FILELIST_CMD was calling pkg_info, which is fine for normal
installation, but fails of course for DESTDIR. Just drop the @ lines
from ${_DEPENDS_PLIST} and use that.
- To make he former work, ensure that _flavor-generate-metadata is part
of _INSTALL_ALL_TARGETS. It was normally a dependency of
_flavor-register, but that is skipped for DESTDIR.
- Remove ${_DEPENDS_PLIST} when running install-clean.
Diffstat (limited to 'mk/install')
| -rw-r--r-- | mk/install/install.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mk/install/install.mk b/mk/install/install.mk index 8892d9f746d..8b2f7e53995 100644 --- a/mk/install/install.mk +++ b/mk/install/install.mk @@ -1,4 +1,4 @@ -# $NetBSD: install.mk,v 1.44 2007/08/10 04:00:43 jlam Exp $ +# $NetBSD: install.mk,v 1.45 2007/08/14 23:58:24 joerg Exp $ # # This file provides the code for the "install" phase. # @@ -168,6 +168,8 @@ _INSTALL_ALL_TARGETS+= post-install-script .endif .if ${_USE_DESTDIR} == "no" _INSTALL_ALL_TARGETS+= _flavor-register +.else +_INSTALL_ALL_TARGETS+= _flavor-generate-metadata .endif _INSTALL_ALL_TARGETS+= privileged-install-hook .if ${_USE_DESTDIR} != "user-destdir" @@ -333,7 +335,7 @@ privileged-install-hook: .PHONY ### later phases so that the "install" target may be re-invoked. ### install-clean: .PHONY package-clean check-clean _flavor-install-clean - ${RUN} ${RM} -f ${PLIST} ${_COOKIE.install} + ${RUN} ${RM} -f ${PLIST} ${_COOKIE.install} ${_DEPENDS_PLIST} ###################################################################### ### bootstrap-register (PUBLIC) |