From patchwork Thu Sep 19 17:10:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 174078 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp1311195ill; Thu, 19 Sep 2019 10:34:37 -0700 (PDT) X-Google-Smtp-Source: APXvYqz30XTvqIpyRkIoCmaGxWVNC7tBlWIPspsWStVgsWbaNziOwFRJTR6UD6C9KQWhLlCfceDV X-Received: by 2002:a50:b6c8:: with SMTP id f8mr17510468ede.33.1568914477165; Thu, 19 Sep 2019 10:34:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568914477; cv=none; d=google.com; s=arc-20160816; b=WmR3CT3QEd6GtQnFcCsaR79AeoKj1OERMP4K0FKbG6VEwEnbHig5aLowwKewx56SKr 7iWx+2fLJ4PAjj6UtMqVg+Z9o5ljgVH0uAlgsd36PXh1fCxxmKNp+d1FOF70+w99+Qj/ 5vokiySkJw4W7lHROav+yWHSuog4+9/kokBKpcQtSTD1WYiLUr5qcrlGd30lDY3xTVza xmHDveGulmEVOp38LVSI1pydS8JBzVE63ggjX5PjMj1RNGkAxnnm0aTJTjp8CAob9Ym3 TSyYXtlZC6A5XUCBfAGH6/1iFIWBt4RarBMb6ctRgzmpBw51KJWmkzS3kTRBHmsPv0JE IJ+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=9KzFKDieUQ0ZocRaEPSFD2NAIupLGWoORjl8U1JZy58=; b=ibJug4mZ20mWbVTQwKaVvuQPHwrfuvjnlDPEO8UUPJ0cDq9uLRMajen86KOTGjgNNK wA+92Tg8yTceasi7CAsg2GxtdpH/k9bK/gksxujw7fdtrSfTJ3uZkDNCKmu4PUarHll5 gpLvdfDDn7vHk7I0CTusnrOAmfHbPQNpY4EGtXR3lr214g1/L4CiMeiiEesrn/45BRJ9 +vT+RD+fMArWhopvPrQa77Ks6w4a4buU0pk13KxIGojbA3l//BggmpbA6SKU36FoV3zq FjhlW8AjUsdlXBim/ZtV4KUMWLVNH3ZQ5/Jeka6xd9n7wbLkq/8R4WjkM8keJdc1fbk/ J8Ow== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=JjNW3GJj; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id k8si5024925edx.450.2019.09.19.10.34.37 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 19 Sep 2019 10:34:37 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=JjNW3GJj; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:47036 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iB0KB-0003UV-NM for patch@linaro.org; Thu, 19 Sep 2019 13:34:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50079) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iB06t-0008Kv-5M for qemu-devel@nongnu.org; Thu, 19 Sep 2019 13:20:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iB05m-0000Oy-Uv for qemu-devel@nongnu.org; Thu, 19 Sep 2019 13:19:44 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:51649) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iB05m-0000OX-NN for qemu-devel@nongnu.org; Thu, 19 Sep 2019 13:19:42 -0400 Received: by mail-wm1-x343.google.com with SMTP id 7so5580577wme.1 for ; Thu, 19 Sep 2019 10:19:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9KzFKDieUQ0ZocRaEPSFD2NAIupLGWoORjl8U1JZy58=; b=JjNW3GJjd7o4+WlIbaiGLZfdMPRuwsOPRbOE/dILPFjnjCA+xUhajV/gk0RnJjKRu4 BeorQ5tYCCB7ozP9g+JHrgQzUXfXlGm5LLTM7ygD9ymIHglJARq2qNt84Oo+p0Zn5gvw yhKl4jPhhjD/ITzHRVWpuG1s5BEyfQUWc0hImXFrlPVjFcHHLRuwmn1pr6s/CORob0nW h0L3keq2bYf1uS+HxYoGR8PRPnsFiNYYfLczl2blHT5gHNMmZpEAPlzSBjXlfb1XwzAx 6ZcCXLgyAGSk6gsM01V5vwK04OIR47Q1a+XWMQS8BwPjlq1mkkpHOkYU9KdSvhR6Yfe/ zu7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9KzFKDieUQ0ZocRaEPSFD2NAIupLGWoORjl8U1JZy58=; b=MtUI88rI4r2cZx0QyA5DmnjQbsXevEFsrIAA9uAXo9VUdfU9HT+LQosPVuOZDYUWrk tR9fUcfuKMaungVOcOFTCSs2XmfqwFZIOVHIL0rfMAerWQrUW7DJm4yrwgUAYYYeGwOk G1R/XwQrSQw64FDK087kwX1sTJcnd+mzpmseXIniRxp32x6qT3l6zHBIpCsvIumr/yXg a92JgDWAszUE6FY44Ca9c4hTL5pyb4IrBTYoNY/u61GXB16CdPXUi/AG+WziRb7vZzFo jqDQjSMXyaPQtLx+kK501BCVn9jLRT4NdyIjgbHF6KRiBsbcYeyVW+dc+bXPTEcrsD/b Ivjw== X-Gm-Message-State: APjAAAXrnD0RdF67j+G/5/H8rhiWfCJZgIrHhqSTJ3bzj1IFDlPXZh+r RgoQ9P365AS8XrSepJwjYUGuwfFyzFM= X-Received: by 2002:a05:600c:204a:: with SMTP id p10mr3977039wmg.175.1568913581547; Thu, 19 Sep 2019 10:19:41 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id j26sm16970160wrd.2.2019.09.19.10.19.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Sep 2019 10:19:40 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 3D8211FF9F; Thu, 19 Sep 2019 18:10:17 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 16/16] Makefile: fix-up qemu-ga.8 paths to take in-src builds into account Date: Thu, 19 Sep 2019 18:10:15 +0100 Message-Id: <20190919171015.12681-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190919171015.12681-1-alex.bennee@linaro.org> References: <20190919171015.12681-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::343 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, qemu-arm@nongnu.org, =?utf-8?q?Alex_Benn?= =?utf-8?b?w6ll?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We tweak MANUAL_BUILDIR for in-src builds because sphinx won't build documents inside a source tree. This was causing the document build to fail on things like shippable which were using in-tree builds. Suggested-by: Peter Maydell Signed-off-by: Alex Bennée --- Makefile | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) -- 2.20.1 diff --git a/Makefile b/Makefile index 3cf5b1e7539..8da33595edd 100644 --- a/Makefile +++ b/Makefile @@ -324,8 +324,19 @@ endif endif endif +# Sphinx does not allow building manuals into the same directory as +# the source files, so if we're doing an in-tree QEMU build we must +# build the manuals into a subdirectory (and then install them from +# there for 'make install'). For an out-of-tree build we can just +# use the docs/ subdirectory in the build tree as normal. +ifeq ($(realpath $(SRC_PATH)),$(realpath .)) +MANUAL_BUILDDIR := docs/built +else +MANUAL_BUILDDIR := docs +endif + ifdef BUILD_DOCS -DOCS=qemu-doc.html qemu-doc.txt qemu.1 qemu-img.1 qemu-nbd.8 docs/interop/qemu-ga.8 +DOCS=qemu-doc.html qemu-doc.txt qemu.1 qemu-img.1 qemu-nbd.8 $(MANUAL_BUILDDIR)/interop/qemu-ga.8 DOCS+=docs/interop/qemu-qmp-ref.html docs/interop/qemu-qmp-ref.txt docs/interop/qemu-qmp-ref.7 DOCS+=docs/interop/qemu-ga-ref.html docs/interop/qemu-ga-ref.txt docs/interop/qemu-ga-ref.7 DOCS+=docs/qemu-block-drivers.7 @@ -703,17 +714,6 @@ dist: qemu-$(VERSION).tar.bz2 qemu-%.tar.bz2: $(SRC_PATH)/scripts/make-release "$(SRC_PATH)" "$(patsubst qemu-%.tar.bz2,%,$@)" -# Sphinx does not allow building manuals into the same directory as -# the source files, so if we're doing an in-tree QEMU build we must -# build the manuals into a subdirectory (and then install them from -# there for 'make install'). For an out-of-tree build we can just -# use the docs/ subdirectory in the build tree as normal. -ifeq ($(realpath $(SRC_PATH)),$(realpath .)) -MANUAL_BUILDDIR := docs/built -else -MANUAL_BUILDDIR := docs -endif - define clean-manual = rm -rf $(MANUAL_BUILDDIR)/$1/_static rm -f $(MANUAL_BUILDDIR)/$1/objects.inv $(MANUAL_BUILDDIR)/$1/searchindex.js $(MANUAL_BUILDDIR)/$1/*.html @@ -823,7 +823,7 @@ ifdef CONFIG_TRACE_SYSTEMTAP $(INSTALL_DATA) scripts/qemu-trace-stap.1 "$(DESTDIR)$(mandir)/man1" endif ifneq (,$(findstring qemu-ga,$(TOOLS))) - $(INSTALL_DATA) docs/interop/qemu-ga.8 "$(DESTDIR)$(mandir)/man8" + $(INSTALL_DATA) $(MANUAL_BUILDDIR)/interop/qemu-ga.8 "$(DESTDIR)$(mandir)/man8" $(INSTALL_DATA) docs/interop/qemu-ga-ref.html "$(DESTDIR)$(qemu_docdir)" $(INSTALL_DATA) docs/interop/qemu-ga-ref.txt "$(DESTDIR)$(qemu_docdir)" $(INSTALL_DATA) docs/interop/qemu-ga-ref.7 "$(DESTDIR)$(mandir)/man7"