[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnunet] 12/12: BUILD: towards better handbook integration
From: |
gnunet |
Subject: |
[gnunet] 12/12: BUILD: towards better handbook integration |
Date: |
Fri, 29 Sep 2023 19:40:09 +0200 |
This is an automated email from the git hooks/post-receive script.
martin-schanzenbach pushed a commit to branch master
in repository gnunet.
commit eba7744c6cf0db8eed005bcde6185ad74c74fcc9
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Fri Sep 29 19:36:28 2023 +0200
BUILD: towards better handbook integration
---
contrib/meson.build | 1 +
doc/meson.build | 27 ++++++++++++++++++++++-----
2 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/contrib/meson.build b/contrib/meson.build
index 29caa54a7..ff8a0a989 100644
--- a/contrib/meson.build
+++ b/contrib/meson.build
@@ -2,6 +2,7 @@ subdir('conf')
subdir('hellos')
subdir('scripts')
+
install_data(['gns'/'def.tex',
'gns'/'gns-bcd.html',
'gns'/'gns-bcd.tex',
diff --git a/doc/meson.build b/doc/meson.build
index a5c2d7729..6bbc2b43e 100644
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -1,7 +1,24 @@
+fs = import('fs')
-install_subdir('handbook/html',
- install_dir: docdir,
- strip_directory: false)
-install_data('handbook/texinfo/gnunet.texi',
- install_dir: get_option('infodir'))
+if fs.exists('handbook'/'html')
+ install_subdir('handbook/html',
+ install_dir: docdir,
+ strip_directory: false)
+else
+ sphinx = find_program('sphinx-build', native: true, required: true)
+
+ if sphinx.found()
+ sphinxhandbook = custom_target('handbook',
+ output: 'handbook',
+ command: [sphinx,
+ '-b', 'html',
+ #'-b', 'info',
+ meson.project_source_root()/'contrib'/'sphinx',
'@OUTPUT@'/'html'],
+ install: true,
+ install_dir: docdir)
+ endif
+endif
+
+#install_data('handbook/texinfo/gnunet.texi',
+# install_dir: get_option('infodir'))
subdir('man')
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [gnunet] 01/12: BUILD: fix math dep, (continued)
- [gnunet] 01/12: BUILD: fix math dep, gnunet, 2023/09/29
- [gnunet] 03/12: BUILD: wrong setup for infile, gnunet, 2023/09/29
- [gnunet] 02/12: BUILD: resolver conf from in, gnunet, 2023/09/29
- [gnunet] 08/12: BUILD: fix man installation, gnunet, 2023/09/29
- [gnunet] 07/12: BUILD: fix versions and installation paths, gnunet, 2023/09/29
- [gnunet] 05/12: BUILD: Fix missing prefix in config data, gnunet, 2023/09/29
- [gnunet] 09/12: BUILD: Add ats tool for now; fix installation of files, gnunet, 2023/09/29
- [gnunet] 11/12: BUILD: Fix doc directory again, actually build statisitics bin, gnunet, 2023/09/29
- [gnunet] 10/12: BUILD: Fix doc directory and doc installation, gnunet, 2023/09/29
- [gnunet] 06/12: BUILD: add tlds to git, gnunet, 2023/09/29
- [gnunet] 12/12: BUILD: towards better handbook integration,
gnunet <=