Skip to content

Commit

Permalink
meson: Generate appendix doc and allow custom manual install path, Gi…
Browse files Browse the repository at this point in the history
…tHub #1781
  • Loading branch information
rdmark committed Nov 23, 2024
1 parent 24dd9bc commit 63ea66e
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 6 deletions.
2 changes: 1 addition & 1 deletion doc/ja/manual/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -98,5 +98,5 @@ custom_target(
'@INPUT@',
],
install: true,
install_dir: datadir / 'doc/netatalk/htmldocs/ja',
install_dir: manual_install_path / 'ja',
)
12 changes: 7 additions & 5 deletions doc/manual/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,12 @@ custom_target(
'@INPUT@',
],
install: true,
install_dir: datadir / 'doc/netatalk/htmldocs',
install_dir: manual_install_path,
)

install_data(
'netatalk.css',
install_dir: datadir / 'doc/netatalk/htmldocs',
)
if get_option('with-manual') == 'local'
install_data(
'netatalk.css',
install_dir: manual_install_path,
)
endif
4 changes: 4 additions & 0 deletions doc/meson.build
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
if build_xml_docs
if get_option('with-manual') == 'www'
input_file = 'html-www.xsl.in'
python = find_program('python3', required: false)
if python.found()
run_command(python, 'generate_compile_docs.py')
endif
else
input_file = 'html.xsl.in'
endif
Expand Down
6 changes: 6 additions & 0 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,12 @@ else
homedir = '/home'
endif

manual_install_path = get_option('with-manual-install-path')

if manual_install_path == ''
manual_install_path = datadir / 'doc/netatalk/htmldocs'
endif

##################
# Compiler flags #
##################
Expand Down
6 changes: 6 additions & 0 deletions meson_options.txt
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,12 @@ option(
value: '',
description: 'Set path to Netatalk lockfile',
)
option(
'with-manual-install-path',
type: 'string',
value: '',
description: 'Set path where to install manual html pages',
)
option(
'with-pam-path',
type: 'string',
Expand Down

0 comments on commit 63ea66e

Please sign in to comment.