diff --git a/build-aux/meson-install-info.sh b/build-aux/meson-install-info.sh new file mode 100644 index 00000000..853ea940 --- /dev/null +++ b/build-aux/meson-install-info.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +infodir=$1 +infofile=$2 + +# Meson post-install script to update info metadata +install-info --info-dir ${MESON_INSTALL_DESTDIR_PREFIX}/${infodir} \ + ${MESON_INSTALL_DESTDIR_PREFIX}/${infodir}/${infofile} + +gzip --force ${MESON_INSTALL_DESTDIR_PREFIX}/${infodir}/${infofile} diff --git a/guile/meson.build b/guile/meson.build index 08512a3b..1da0d38f 100644 --- a/guile/meson.build +++ b/guile/meson.build @@ -85,6 +85,12 @@ if makeinfo.found() '-o', join_paths(meson.current_build_dir(), 'mu-guile.info'), join_paths(meson.current_source_dir(), 'mu-guile.texi'), '-I', join_paths(meson.current_build_dir(), '..')]) + + if install_info.found() + meson.add_install_script(install_info_script, 'share/info', 'mu-guile.info') + endif + + endif guile_scm_dir=join_paths(datadir, 'guile', 'site', '3.0', 'mu') diff --git a/meson.build b/meson.build index c190f7ed..067153b5 100644 --- a/meson.build +++ b/meson.build @@ -117,11 +117,11 @@ gmime_dep = dependency('gmime-3.0', version: '>= 3.2') xapian_dep = dependency('xapian-core', version:'>= 1.4') thread_dep = dependency('threads') +awk=find_program(['gawk', 'awk']) +gzip=find_program('gzip') + # soft dependencies guile_dep = dependency('guile-3.0', required: get_option('guile')) - -awk=find_program(['gawk', 'awk']) - # soft dependencies # emacs -- needed for mu4e compilation @@ -134,6 +134,14 @@ endif makeinfo=find_program(['makeinfo'], required:false) if not makeinfo.found() message('makeinfo (texinfo) not found; not building info documentation') +else + install_info=find_program(['install-info'], required:false) + if not install_info.found() + message('install-info not found') + else + install_info_script=join_paths(meson.current_source_dir(), 'build-aux', + 'meson-install-info.sh') + endif endif # readline. annoyingly, macos has an incompatible libedit claiming to be diff --git a/mu4e/meson.build b/mu4e/meson.build index 87bcdfc3..0431e4f7 100644 --- a/mu4e/meson.build +++ b/mu4e/meson.build @@ -109,8 +109,7 @@ if makeinfo.found() version_texi = configure_file( input: 'version.texi.in', output: 'version.texi', - configuration: version_texi_data - ) + configuration: version_texi_data) custom_target('mu4e_info', input: 'mu4e.texi', @@ -121,4 +120,7 @@ if makeinfo.found() '-o', join_paths(meson.current_build_dir(), 'mu4e.info'), join_paths(meson.current_source_dir(), 'mu4e.texi'), '-I', join_paths(meson.current_build_dir(), '..')]) + if install_info.found() + meson.add_install_script(install_info_script, 'share/info', 'mu4e.info') + endif endif