All of lore.kernel.org
 help / color / mirror / Atom feed
From: marcandre.lureau@redhat.com
To: qemu-devel@nongnu.org
Cc: sw@weilnetz.de, berrange@redhat.com,
	"Marc-André Lureau" <marcandre.lureau@redhat.com>,
	pbonzini@redhat.com
Subject: [PATCH v2 4/5] meson: use meson mandir instead of qemu_mandir
Date: Tue, 25 Aug 2020 21:58:26 +0400	[thread overview]
Message-ID: <20200825175827.355940-5-marcandre.lureau@redhat.com> (raw)
In-Reply-To: <20200825175827.355940-1-marcandre.lureau@redhat.com>

From: Marc-André Lureau <marcandre.lureau@redhat.com>

When cross-compiling, by default qemu_mandir is 'c:\Program
Files\QEMU', which is not recognized as being an absolute path, and
meson will end up adding the prefix again.

Use the pre-prefixed meson mandir option instead.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 33281cecc3..0720a7d684 100644
--- a/meson.build
+++ b/meson.build
@@ -1210,7 +1210,7 @@ if build_docs
                           output: man,
                           capture: true,
                           install: true,
-                          install_dir: config_host['mandir'] / 'man7',
+                          install_dir: get_option('mandir') / 'man7',
                           command: [pod2man, '--utf8', '--section=7', '--center=" "',
                                     '--release=" "', '@INPUT@'])
     endforeach
-- 
2.26.2



  parent reply	other threads:[~2020-08-25 18:00 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-08-25 17:58 [PATCH v2 0/5] meson: mingw installation fixes & nsis conversion marcandre.lureau
2020-08-25 17:58 ` [PATCH v2 1/5] meson: pass confsuffix option marcandre.lureau
2020-08-26  8:28   ` Daniel P. Berrangé
2020-08-25 17:58 ` [PATCH v2 2/5] meson: use meson datadir instead of qemu_datadir marcandre.lureau
2020-08-26  8:29   ` Daniel P. Berrangé
2020-08-26  8:53     ` Marc-André Lureau
2020-08-26  9:45       ` Paolo Bonzini
2020-08-25 17:58 ` [PATCH v2 3/5] meson: add docdir option and pass pre-prefix qemu_docdir marcandre.lureau
2020-08-26  8:32   ` Daniel P. Berrangé
2020-08-26  8:38     ` Marc-André Lureau
2020-08-25 17:58 ` marcandre.lureau [this message]
2020-08-26  8:33   ` [PATCH v2 4/5] meson: use meson mandir instead of qemu_mandir Daniel P. Berrangé
2020-08-25 17:58 ` [PATCH v2 5/5] meson: add NSIS building marcandre.lureau
2020-08-26  8:40   ` Daniel P. Berrangé

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200825175827.355940-5-marcandre.lureau@redhat.com \
    --to=marcandre.lureau@redhat.com \
    --cc=berrange@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=sw@weilnetz.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.