gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-08-02 11:38:07 -07:00
Code Issues Projects Releases Wiki Activity

dev-vcs/git: use new htmldir meson option to control GIT_HTML_PATH

Browse Source 
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>
This commit is contained in:
D. Ben Knoble
2025-11-04 08:47:39 -05:00
committed by Sam James
parent f42a5b9f87
commit d4e7658a94
3 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dev-vcs/git/git-9999-r1.ebuild
View File

@@ -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]

6
dev-vcs/git/git-9999-r2.ebuild
View File

@@ -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]

6
dev-vcs/git/git-9999-r3.ebuild
View File

@@ -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]