averello/git-mirror
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-12-12 20:36:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

meson: make GIT_HTML_PATH configurable

Browse Source 
Makefile-based builds can configure Git's internal HTML_PATH by defining
htmldir, which is useful for packagers that put documentation in
different locations. Gentoo, for example, uses version-suffixed
directories like ${prefix}/share/doc/git-2.51 and puts the HTML
documentation in an 'html' subdirectory of the same.

Propagate the same configuration knob to Meson-based builds so that
"git --html-path" on such systems can be configured to output the
correct directory.

Signed-off-by: D. Ben Knoble <ben.knoble+github@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
D. Ben Knoble
2025-11-04 08:58:29 -05:00
committed by Junio C Hamano
parent 7f278e958a
commit d63417e3ad
7 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/howto/meson.build
View File

@@ -35,7 +35,7 @@ doc_targets += custom_target(
output: 'howto-index.html',
depends: documentation_deps,
install: true,
install_dir: get_option('datadir') / 'doc/git-doc',
install_dir: htmldir,
)
foreach howto : howto_sources
@@ -57,6 +57,6 @@ foreach howto : howto_sources
output: fs.stem(howto_stripped.full_path()) + '.html',
depends: documentation_deps,
install: true,
install_dir: get_option('datadir') / 'doc/git-doc/howto',
install_dir: htmldir / 'howto',
)
endforeach

12
Documentation/meson.build
View File

@@ -412,7 +412,7 @@ foreach manpage, category : manpages
input: manpage,
output: fs.stem(manpage) + '.html',
install: true,
install_dir: get_option('datadir') / 'doc/git-doc',
install_dir: htmldir,
)
endif
endforeach
@@ -423,7 +423,7 @@ if get_option('docs').contains('html')
output: 'docinfo.html',
copy: true,
install: true,
install_dir: get_option('datadir') / 'doc/git-doc',
install_dir: htmldir,
)
configure_file(
@@ -431,11 +431,11 @@ if get_option('docs').contains('html')
output: 'docbook-xsl.css',
copy: true,
install: true,
install_dir: get_option('datadir') / 'doc/git-doc',
install_dir: htmldir,
)
install_symlink('index.html',
install_dir: get_option('datadir') / 'doc/git-doc',
install_dir: htmldir,
pointing_to: 'git.html',
)
@@ -466,7 +466,7 @@ if get_option('docs').contains('html')
input: 'docbook.xsl',
output: 'user-manual.html',
install: true,
install_dir: get_option('datadir') / 'doc/git-doc',
install_dir: htmldir,
)
articles = [
@@ -492,7 +492,7 @@ if get_option('docs').contains('html')
output: fs.stem(article) + '.html',
depends: documentation_deps,
install: true,
install_dir: get_option('datadir') / 'doc/git-doc',
install_dir: htmldir,
)
endforeach

4
Documentation/technical/meson.build
View File

@@ -53,7 +53,7 @@ doc_targets += custom_target(
output: 'api-index.html',
depends: documentation_deps,
install: true,
install_dir: get_option('datadir') / 'doc/git-doc/technical',
install_dir: htmldir / 'technical',
)
foreach article : api_docs + articles
@@ -63,6 +63,6 @@ foreach article : api_docs + articles
output: fs.stem(article) + '.html',
depends: documentation_deps,
install: true,
install_dir: get_option('datadir') / 'doc/git-doc/technical',
install_dir: htmldir / 'technical',
)
endforeach