diff options
| -rw-r--r-- | lang/rust-bin/Makefile | 4 | ||||
| -rwxr-xr-x | lang/rust-bin/files/install.sh | 22 |
2 files changed, 13 insertions, 13 deletions
diff --git a/lang/rust-bin/Makefile b/lang/rust-bin/Makefile index a899601d202..795121ec3da 100644 --- a/lang/rust-bin/Makefile +++ b/lang/rust-bin/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.22 2021/06/12 20:43:41 he Exp $ +# $NetBSD: Makefile,v 1.23 2021/06/13 12:25:02 he Exp $ DISTNAME= rust-1.52.1 PKGNAME= ${DISTNAME:S/rust/rust-bin/1} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= lang MASTER_SITES= https://static.rust-lang.org/dist/ DIST_SUBDIR= ${PKGNAME_NOREV} diff --git a/lang/rust-bin/files/install.sh b/lang/rust-bin/files/install.sh index c8e88a4c7eb..1cc270c3332 100755 --- a/lang/rust-bin/files/install.sh +++ b/lang/rust-bin/files/install.sh @@ -569,18 +569,18 @@ install_components() { _file_install_path="$CFG_DESTDIR_PREFIX/$PKGMANDIR/$_f" ;; share/doc/*) - # HACK: Try to support overriding --docdir. Paths with the form - # "share/doc/$product/" can be redirected to a single --docdir - # path. If the following detects that --docdir has been specified - # then it will replace everything preceeding the "$product" path - # component. The problem here is that the combined rust installer - # contains two "products": rust and cargo; so the contents of those - # directories will both be dumped into the same directory; and the - # contents of those directories are _not_ disjoint. Since this feature - # is almost entirely to support 'make install' anyway I don't expect - # this problem to be a big deal in practice. + # HACK: Try to support overriding --docdir. Paths with the form + # "share/doc/$product/" can be redirected to a single --docdir + # path. If the following detects that --docdir has been specified + # then it will replace everything preceeding the "$product" path + # component. The problem here is that the combined rust installer + # contains two "products": rust and cargo; so the contents of those + # directories will both be dumped into the same directory; and the + # contents of those directories are _not_ disjoint. Since this feature + # is almost entirely to support 'make install' anyway I don't expect + # this problem to be a big deal in practice. if [ "$CFG_DOCDIR" != "<default>" ]; then - local _f=${_file#"share/doc/"} + local _f=${_file#"share/doc/"*/} _file_install_path="$CFG_DOCDIR/$_f" fi ;; |