]> git.proxmox.com Git - mirror_qemu.git/commitdiff
meson: fix rule for qemu-ga installer
authorPaolo Bonzini <pbonzini@redhat.com>
Mon, 22 May 2023 07:19:03 +0000 (09:19 +0200)
committerPaolo Bonzini <pbonzini@redhat.com>
Thu, 25 May 2023 08:02:43 +0000 (10:02 +0200)
The bindir variable is not available in the "glib" variable, which is an internal
dependency (created with "declare_dependency").  Use glib_pc instead, which contains
the variable as it is instantiated from glib-2.0.pc.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
qga/meson.build

index 622b5f94a232f6fcad528c111ed54854e9e1ee78..d3291b4376cb851eec56af474fc55d662909efca 100644 (file)
@@ -154,7 +154,7 @@ if targetos == 'windows'
                               qemu_ga_msi_arch[cpu],
                               qemu_ga_msi_vss,
                               '-D', 'BUILD_DIR=' + meson.project_build_root(),
-                              '-D', 'BIN_DIR=' + glib.get_variable('bindir'),
+                              '-D', 'BIN_DIR=' + glib_pc.get_variable('bindir'),
                               '-D', 'QEMU_GA_VERSION=' + config_host['QEMU_GA_VERSION'],
                               '-D', 'QEMU_GA_MANUFACTURER=' + config_host['QEMU_GA_MANUFACTURER'],
                               '-D', 'QEMU_GA_DISTRO=' + config_host['QEMU_GA_DISTRO'],