diff options
| -rw-r--r-- | build-aux/meson-install-info.sh | 7 | ||||
| -rw-r--r-- | guile/meson.build | 4 | ||||
| -rw-r--r-- | mu4e/meson.build | 3 |
3 files changed, 7 insertions, 7 deletions
diff --git a/build-aux/meson-install-info.sh b/build-aux/meson-install-info.sh index 9efe63d..6b0b599 100644 --- a/build-aux/meson-install-info.sh +++ b/build-aux/meson-install-info.sh @@ -4,11 +4,10 @@ infodir=$1 infofile=$2 # Meson post-install script to update info metadata + # If DESTDIR is set, do _not_ install-info, since it's only a temporary # install if test -z "${DESTDIR}"; then - install-info --info-dir ${MESON_INSTALL_DESTDIR_PREFIX}/${infodir} \ - ${MESON_INSTALL_DESTDIR_PREFIX}/${infodir}/${infofile} + install-info --info-dir "${infodir}" "${infodir}/${infofile}" + gzip --force "${infodir}/${infofile}" fi - -gzip --force ${MESON_INSTALL_DESTDIR_PREFIX}/${infodir}/${infofile} diff --git a/guile/meson.build b/guile/meson.build index 4a372ef..dd25dd5 100644 --- a/guile/meson.build +++ b/guile/meson.build @@ -87,9 +87,9 @@ 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') + infodir = join_paths(get_option('prefix') / get_option('infodir')) + meson.add_install_script(install_info_script, infodir, 'mu-guile.info') endif endif diff --git a/mu4e/meson.build b/mu4e/meson.build index 2878026..fec9942 100644 --- a/mu4e/meson.build +++ b/mu4e/meson.build @@ -152,6 +152,7 @@ if makeinfo.found() 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') + infodir = join_paths(get_option('prefix') / get_option('infodir')) + meson.add_install_script(install_info_script, infodir, 'mu4e.info') endif endif |