BUILD: Meson, better handbook generation

2 files changed, 43 insertions, 23 deletions

diff --git a/doc/handbook/meson.build b/doc/handbook/meson.build
new file mode 100644
index 000000000..9d33a277b
--- /dev/null
+++ b/doc/handbook/meson.build
@@ -0,0 +1,42 @@
+fs = import('fs')
+makeinfo = find_program('makeinfo', native: true, required: false)
+sphinx = find_program('sphinx-build', native: true, required: false)
+
+if fs.exists('html')
+  install_subdir('html',
+                 install_dir: docdir,
+                 strip_directory: false)
+else
+  if sphinx.found()
+    sphinxhandbook = custom_target('handbook-html',
+      output: 'html',
+      command: [sphinx,
+              '-M', 'html',
+              meson.project_source_root()/'contrib'/'sphinx', meson.current_build_dir()],
+      install: true,
+      install_dir: docdir)
+  endif
+endif
+
+if fs.exists('texinfo')
+  install_data('handbook/texinfo/gnunet.info',
+               install_dir: get_option('infodir'))
+else
+  if sphinx.found()
+    sphinxhandbooktexi = custom_target('handbook-texinfo',
+      output: ['texinfo'],
+      command: [sphinx,
+              '-M', 'texinfo',
+              meson.project_source_root()/'contrib'/'sphinx', meson.current_build_dir()],
+      install: false,
+      install_dir: get_option('infodir'))
+    custom_target('gnunet.info',
+    output: 'gnunet.info',
+    depends: sphinxhandbooktexi,
+    command: [makeinfo, '--no-split', '--no-headers',
+              meson.current_build_dir()/'texinfo'/'gnunet.texi', '-o', '@OUTPUT0@'],
+      install: true,
+      install_dir: get_option('infodir'))
+  endif
+endif
+
diff --git a/doc/meson.build b/doc/meson.build
index 6bbc2b43e..84b3cfde2 100644
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -1,24 +1,2 @@
-fs = import('fs')
-
-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('handbook')
 subdir('man')