diff options
author | Christopher Baines <mail@cbaines.net> | 2024-04-20 11:18:46 +0100 |
---|---|---|
committer | Christopher Baines <mail@cbaines.net> | 2024-04-20 11:18:46 +0100 |
commit | 6b881028a3f9c01eb4b3d0ab2e8058105cb59207 (patch) | |
tree | 8e738c4e04a21ba45a22ebbecd521a5d761a5d52 /gnu/packages/patches/qemu-build-info-manual.patch | |
parent | c364566cb7286bf96e358bdd132cda3c6322feff (diff) | |
parent | 3d2966e0b7dbf15a5cb497037ace73d1be92febf (diff) | |
download | guix-6b881028a3f9c01eb4b3d0ab2e8058105cb59207.tar guix-6b881028a3f9c01eb4b3d0ab2e8058105cb59207.tar.gz |
Merge commit '3d2966e0b7' into core-update-new-2
Change-Id: I532430d9692b48cb3fbde2af8753b7d9829aa1da
Conflicts:
gnu/local.mk
gnu/packages/freedesktop.scm
gnu/packages/java.scm
gnu/packages/llvm.scm
gnu/packages/man.scm
gnu/packages/telegram.scm
gnu/packages/wm.scm
Diffstat (limited to 'gnu/packages/patches/qemu-build-info-manual.patch')
-rw-r--r-- | gnu/packages/patches/qemu-build-info-manual.patch | 37 |
1 files changed, 10 insertions, 27 deletions
diff --git a/gnu/packages/patches/qemu-build-info-manual.patch b/gnu/packages/patches/qemu-build-info-manual.patch index ff28266aaa..0950787810 100644 --- a/gnu/packages/patches/qemu-build-info-manual.patch +++ b/gnu/packages/patches/qemu-build-info-manual.patch @@ -13,50 +13,33 @@ readers. Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com> diff --git a/docs/meson.build b/docs/meson.build +index 9040f860ae..2ae7886fcb 100644 --- a/docs/meson.build +++ b/docs/meson.build -@@ -92,4 +92,25 @@ if build_docs +@@ -98,4 +98,26 @@ if build_docs alias_target('sphinxdocs', sphinxdocs) alias_target('html', sphinxdocs) alias_target('man', sphinxmans) + -+ # Generate a Texinfo version of the QEMU manual. ++ # Add a target to build and install a Texinfo version of the QEMU ++ # manual, if 'makeinfo' is available. + makeinfo = find_program(['texi2any', 'makeinfo']) + if makeinfo.found() + sphinxtexi = custom_target( -+ 'QEMU manual generated texinfo source', -+ output: ['QEMU.texi', 'sphinxtexi.stamp'], ++ 'qemu.texi', ++ output: ['qemu.texi', 'sphinxtexi.stamp'], + depfile: 'sphinxtexi.d', + command: [SPHINX_ARGS, '-Ddepfile=@DEPFILE@', + '-Ddepfile_stamp=@OUTPUT1@', '-b', 'texinfo', -+ meson.current_source_dir(), meson.current_build_dir()]) ++ '-d', private_dir, input_dir, meson.current_build_dir()]) + sphinxinfo = custom_target( -+ 'QEMU info manual', ++ 'qemu.info', + input: sphinxtexi, -+ output: 'QEMU.info', ++ output: 'qemu.info', + install: true, + install_dir: get_option('infodir'), -+ command: [makeinfo, '--no-split', '@INPUT0@', '--output=@OUTPUT@']) ++ command: [makeinfo, '--no-split', '--output=@OUTPUT@', '@INPUT0@']) + alias_target('texi', sphinxtexi) + alias_target('info', sphinxinfo) + endif endif -diff --git a/meson.build b/meson.build ---- a/meson.build -+++ b/meson.build -@@ -37,6 +37,7 @@ endif - qemu_confdir = get_option('sysconfdir') / get_option('qemu_suffix') - qemu_datadir = get_option('datadir') / get_option('qemu_suffix') - qemu_docdir = get_option('docdir') / get_option('qemu_suffix') -+qemu_infodir = get_option('infodir') / get_option('qemu_suffix') - qemu_moddir = get_option('libdir') / get_option('qemu_suffix') - - qemu_desktopdir = get_option('datadir') / 'applications' -@@ -3698,6 +3699,7 @@ else - summary_info += {'local state directory': 'queried at runtime'} - endif - summary_info += {'Doc directory': get_option('prefix') / get_option('docdir')} -+summary_info += {'Info directory': get_option('prefix') / get_option('infodir')} - summary_info += {'Build directory': meson.current_build_dir()} - summary_info += {'Source path': meson.current_source_dir()} - summary_info += {'GIT submodules': config_host['GIT_SUBMODULES']} |