diff options
| author | joerg <joerg> | 2007-08-14 23:58:24 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2007-08-14 23:58:24 +0000 |
| commit | c00f30758713bb27fca3dfb9609a2234e5e161c4 (patch) | |
| tree | 9854d3f8c0dccfa11f155aaa3347ce10f456e38e /mk/check | |
| parent | 37a0aa61b2be0a91c04d18be6d27b5499ce694bd (diff) | |
| download | pkgsrc-c00f30758713bb27fca3dfb9609a2234e5e161c4.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/check')
| -rw-r--r-- | mk/check/check-perms.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/check/check-perms.mk b/mk/check/check-perms.mk index 90725b9aa16..a5b080f75bf 100644 --- a/mk/check/check-perms.mk +++ b/mk/check/check-perms.mk @@ -1,4 +1,4 @@ -# $NetBSD: check-perms.mk,v 1.9 2007/07/23 12:10:56 joerg Exp $ +# $NetBSD: check-perms.mk,v 1.10 2007/08/14 23:58:24 joerg Exp $ # # This file checks that after installation of a package, all files and # directories of that package have sensible permissions set. @@ -90,7 +90,7 @@ _check-perms: .PHONY ${CHECK_PERMS_SKIP:@p@${PREFIX}/${p}|${p}) continue ;;@}\ *) ;; \ esac; \ - printf "%s\\n" "$$file"; \ + printf "%s\\n" "${DESTDIR}$$file"; \ done \ | awk ${_CHECK_PERMS_GETDIRS_AWK:Q} \ | ${_CHECK_PERMS_CMD} ${_CHECK_PERMS_FLAGS} |