diff options
| author | D. Ben Knoble <ben.knoble+github@gmail.com> | 2025-11-04 08:47:39 -0500 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2025-11-16 08:05:32 +0000 |
| commit | d4e7658a9488679258dc7ebf75d5b30bd4460ea3 (patch) | |
| tree | aaae1facfcaa1d4ae270eb805cf22e5de82985ed /dev-vcs | |
| parent | f42a5b9f87f6131095332dc853ed1d0d5b5e606c (diff) | |
| download | gentoo-d4e7658a9488679258dc7ebf75d5b30bd4460ea3.tar.gz gentoo-d4e7658a9488679258dc7ebf75d5b30bd4460ea3.tar.bz2 gentoo-d4e7658a9488679258dc7ebf75d5b30bd4460ea3.zip | |
dev-vcs/git: use new htmldir meson option to control GIT_HTML_PATH
This makes packaging the HTML docs easier, but more importantly means
that "git --html-path" reports the correct directory.
Signed-off-by: D. Ben Knoble <ben.knoble+github@gmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/44462
Closes: https://github.com/gentoo/gentoo/pull/44462
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-vcs')
| -rw-r--r-- | dev-vcs/git/git-9999-r1.ebuild | 6 | ||||
| -rw-r--r-- | dev-vcs/git/git-9999-r2.ebuild | 6 | ||||
| -rw-r--r-- | dev-vcs/git/git-9999-r3.ebuild | 6 |
3 files changed, 3 insertions, 15 deletions
diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild index 3de51238c45f..68a5ad083cec 100644 --- a/dev-vcs/git/git-9999-r1.ebuild +++ b/dev-vcs/git/git-9999-r1.ebuild @@ -245,6 +245,7 @@ src_configure() { if [[ ${PV} == *9999 ]] || use doc ; then emesonargs+=( -Ddocs="man$(usev doc ',html')" + -Dhtmldir="${EPREFIX}/usr/share/doc/${PF}/html" ) fi @@ -334,11 +335,6 @@ src_test() { src_install() { meson_src_install - if use doc ; then - cp -r "${ED}"/usr/share/doc/git-doc/. "${ED}"/usr/share/doc/${PF}/html || die - rm -rf "${ED}"/usr/share/doc/git-doc/ || die - fi - # Depending on the tarball and manual rebuild of the documentation, the # manpages may exist in either OR both of these directories. find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild index 3de51238c45f..68a5ad083cec 100644 --- a/dev-vcs/git/git-9999-r2.ebuild +++ b/dev-vcs/git/git-9999-r2.ebuild @@ -245,6 +245,7 @@ src_configure() { if [[ ${PV} == *9999 ]] || use doc ; then emesonargs+=( -Ddocs="man$(usev doc ',html')" + -Dhtmldir="${EPREFIX}/usr/share/doc/${PF}/html" ) fi @@ -334,11 +335,6 @@ src_test() { src_install() { meson_src_install - if use doc ; then - cp -r "${ED}"/usr/share/doc/git-doc/. "${ED}"/usr/share/doc/${PF}/html || die - rm -rf "${ED}"/usr/share/doc/git-doc/ || die - fi - # Depending on the tarball and manual rebuild of the documentation, the # manpages may exist in either OR both of these directories. find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild index 3de51238c45f..68a5ad083cec 100644 --- a/dev-vcs/git/git-9999-r3.ebuild +++ b/dev-vcs/git/git-9999-r3.ebuild @@ -245,6 +245,7 @@ src_configure() { if [[ ${PV} == *9999 ]] || use doc ; then emesonargs+=( -Ddocs="man$(usev doc ',html')" + -Dhtmldir="${EPREFIX}/usr/share/doc/${PF}/html" ) fi @@ -334,11 +335,6 @@ src_test() { src_install() { meson_src_install - if use doc ; then - cp -r "${ED}"/usr/share/doc/git-doc/. "${ED}"/usr/share/doc/${PF}/html || die - rm -rf "${ED}"/usr/share/doc/git-doc/ || die - fi - # Depending on the tarball and manual rebuild of the documentation, the # manpages may exist in either OR both of these directories. find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157] |