From patchwork Fri Mar 8 13:57:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 10844945 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DAF721515 for ; Fri, 8 Mar 2019 13:58:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C78962E3D4 for ; Fri, 8 Mar 2019 13:58:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BB2B32E4A3; Fri, 8 Mar 2019 13:58:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 357A32E3D4 for ; Fri, 8 Mar 2019 13:58:47 +0000 (UTC) Received: from localhost ([127.0.0.1]:44064 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h2G1N-000501-Hm for patchwork-qemu-devel@patchwork.kernel.org; Fri, 08 Mar 2019 08:58:45 -0500 Received: from eggs.gnu.org ([209.51.188.92]:47778) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h2G0X-0004PW-Ag for qemu-devel@nongnu.org; Fri, 08 Mar 2019 08:57:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h2G0V-0002e9-Ac for qemu-devel@nongnu.org; Fri, 08 Mar 2019 08:57:53 -0500 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:40265) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h2G0V-0002TG-2q for qemu-devel@nongnu.org; Fri, 08 Mar 2019 08:57:51 -0500 Received: by mail-wm1-x342.google.com with SMTP id g20so12381199wmh.5 for ; Fri, 08 Mar 2019 05:57:49 -0800 (PST) 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=jMro1OnfKFvU/MhVakf4DkWtZ4sQcf1ggmtogoCjv+o=; b=t5IN600JVOG6JacIjFThg3Mot3HST5BaxoHeKLkT4lc4ROaX+ScOHrxiGsaqf9robu L/LDOXSSh4+2J20uEyG2i67XsJxBv8PGzgOCkd4o/jII4ZKc/NCp7pFvaHFVg0Rj9G8a YKDBYEyW5TZVJA4ETFP8vl+5S1cVVY4uJ3mAYZejxKjLXSrnnp8/0cE4KJCW80vkvhV+ znhUqkXtz21/5//73gj4bLFwjUV2i0y1/JkIp1har+mwbTEJVeDEWglM+dSFFLCJ+T1H byDhDAbUZj0MeUGMCGFiXQAxHTa15fNqQFl/FB3TCCYj8o0k2wGiS2YiVOQQZfnmNuCx o7VA== 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=jMro1OnfKFvU/MhVakf4DkWtZ4sQcf1ggmtogoCjv+o=; b=gO4hPeAJkKdmEvb6qje8+DCI4javWWZG3632UbKsG9MTdbC5tLpMwYhRYu+/3DwHZf la7tb+R7xth3JOiLHl4fTfCOvqq0cx1Y+DBQIyryxd3GKqXxsTah/cSqcQwsHR5Vxwby cqsXIEltEtg865pQGxa7Hl6Df3FmOe/dg5Xfna6O49S8/ghBqjrjkjEL9sKGuLYHOezZ fbdxEuT8cQQjRCLJwTMZvTqp1ogG6dtQG4YiLFe/oyjkx2ZMCpipk/otyfdrnpNBEsnl ue3TokElOg7XjYVUcVLv1BjI7D3b86GFTcL6PbyR7T+18/kZCBmLGh7cr/2xtNI1XuFj hb5g== X-Gm-Message-State: APjAAAX4FSDkVjzQvOEcX0tjoeKAE2JqTrJEt0GI92Elquy338By4yIF Ef/7qOlhbUuBSuG15ZoUVmdbQpRF2KM= X-Google-Smtp-Source: APXvYqxiuDDDKSsen2LdTiYzuDu7Fd0ZDZDUPZzzlz8yAM2BuTfnKBI4VVJpAp9LeJ2hgZH4XfbWCg== X-Received: by 2002:a1c:96ce:: with SMTP id y197mr9464301wmd.126.1552053467808; Fri, 08 Mar 2019 05:57:47 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id o12sm13488539wrx.53.2019.03.08.05.57.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Mar 2019 05:57:47 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Date: Fri, 8 Mar 2019 13:57:42 +0000 Message-Id: <20190308135744.6480-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190308135744.6480-1-peter.maydell@linaro.org> References: <20190308135744.6480-1-peter.maydell@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::342 Subject: [Qemu-devel] [PATCH 1/3] Makefile: Fix Sphinx documentation builds for in-tree builds X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , patches@linaro.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP The Sphinx build-sphinx tool does not permit building a manual into the same directory as its source files. This meant that commit 5f71eac06e15b9a3fa1134d446f broke QEMU in-source-tree builds, which would fail with: Error: source directory and destination directory are same. Fix this by making in-tree builds build the Sphinx manuals into a subdirectory of docs/. Fixes: 5f71eac06e15b9a3fa1134d446f ("Makefile, configure: Support building rST documentation") Reported-by: Philippe Mathieu-Daudé Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé --- Makefile | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index d2463c92371..0194ef7fa55 100644 --- a/Makefile +++ b/Makefile @@ -655,12 +655,20 @@ dist: qemu-$(VERSION).tar.bz2 qemu-%.tar.bz2: $(SRC_PATH)/scripts/make-release "$(SRC_PATH)" "$(patsubst qemu-%.tar.bz2,%,$@)" -# Note that these commands assume that there are no HTML files in -# the docs subdir in the source tree! If there are then this will -# blow them away for an in-source-tree 'make clean'. +# 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 docs/$1/_static -rm -f docs/$1/objects.inv docs/$1/searchindex.js docs/$1/*.html +rm -rf $(MANUAL_BUILDDIR)/$1/_static +rm -f $(MANUAL_BUILDDIR)/$1/objects.inv $(MANUAL_BUILDDIR)/$1/searchindex.js $(MANUAL_BUILDDIR)/$1/*.html endef distclean: clean @@ -720,8 +728,8 @@ BLOBS= endif define install-manual = -for d in $$(cd docs && find $1 -type d); do $(INSTALL_DIR) "$(DESTDIR)$(qemu_docdir)/$$d"; done -for f in $$(cd docs && find $1 -type f); do $(INSTALL_DATA) "docs/$$f" "$(DESTDIR)$(qemu_docdir)/$$f"; done +for d in $$(cd $(MANUAL_BUILDDIR) && find $1 -type d); do $(INSTALL_DIR) "$(DESTDIR)$(qemu_docdir)/$$d"; done +for f in $$(cd $(MANUAL_BUILDDIR) && find $1 -type f); do $(INSTALL_DATA) "$(MANUAL_BUILDDIR)/$$f" "$(DESTDIR)$(qemu_docdir)/$$f"; done endef # Note that we deliberately do not install the "devel" manual: it is @@ -885,17 +893,17 @@ docs/version.texi: $(SRC_PATH)/VERSION # and handles "don't rebuild things unless necessary" itself. # The '.doctrees' files are cached information to speed this up. .PHONY: sphinxdocs -sphinxdocs: docs/devel/index.html docs/interop/index.html +sphinxdocs: $(MANUAL_BUILDDIR)/devel/index.html $(MANUAL_BUILDDIR)/interop/index.html # Canned command to build a single manual -build-manual = $(call quiet-command,sphinx-build $(if $(V),,-q) -b html -D version=$(VERSION) -D release="$(FULL_VERSION)" -d .doctrees/$1 $(SRC_PATH)/docs/$1 docs/$1 ,"SPHINX","docs/$1") +build-manual = $(call quiet-command,sphinx-build $(if $(V),,-q) -b html -D version=$(VERSION) -D release="$(FULL_VERSION)" -d .doctrees/$1 $(SRC_PATH)/docs/$1 $(MANUAL_BUILDDIR)/$1 ,"SPHINX","$(MANUAL_BUILDDIR)/$1") # We assume all RST files in the manual's directory are used in it manual-deps = $(wildcard $(SRC_PATH)/docs/$1/*.rst) $(SRC_PATH)/docs/$1/conf.py $(SRC_PATH)/docs/conf.py -docs/devel/index.html: $(call manual-deps,devel) +$(MANUAL_BUILDDIR)/devel/index.html: $(call manual-deps,devel) $(call build-manual,devel) -docs/interop/index.html: $(call manual-deps,interop) +$(MANUAL_BUILDDIR)/interop/index.html: $(call manual-deps,interop) $(call build-manual,interop) qemu-options.texi: $(SRC_PATH)/qemu-options.hx $(SRC_PATH)/scripts/hxtool From patchwork Fri Mar 8 13:57:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 10844949 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 683E91390 for ; Fri, 8 Mar 2019 14:00:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 559332E4DF for ; Fri, 8 Mar 2019 14:00:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 49E222E513; Fri, 8 Mar 2019 14:00:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C912A2E508 for ; Fri, 8 Mar 2019 14:00:32 +0000 (UTC) Received: from localhost ([127.0.0.1]:44165 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h2G35-0006SW-MS for patchwork-qemu-devel@patchwork.kernel.org; Fri, 08 Mar 2019 09:00:31 -0500 Received: from eggs.gnu.org ([209.51.188.92]:47794) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h2G0Z-0004PY-2o for qemu-devel@nongnu.org; Fri, 08 Mar 2019 08:57:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h2G0W-0002ih-DC for qemu-devel@nongnu.org; Fri, 08 Mar 2019 08:57:55 -0500 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:36175) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h2G0W-0002XY-5L for qemu-devel@nongnu.org; Fri, 08 Mar 2019 08:57:52 -0500 Received: by mail-wm1-x342.google.com with SMTP id j125so12547102wmj.1 for ; Fri, 08 Mar 2019 05:57:50 -0800 (PST) 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=VjdfW5MWjFO5vspsyG+fi+mIgP6Or6hxJg1O0dMbsYk=; b=BsSTgNg/eUYwx10u1wINVIBHjfBY/6Pqs+ItNwf28n9YfKwiwtG+41VvsMCChGHlPZ ncoPs2gMkr+56KhyK1KeM0k5M5UiNKKlZqROwgSSBwRUwfSFPlyVoVQkxRIpA0uPx67t r9m9TUFbl4a32RCoMbjkYI8dwxEgDQfOhG+SI9YbbMQ0WFaIYdytmZwCp0s02aISqScL FJud4KvoGs66+1Kg2Sx5CkIJdeBVfVSwpmAb3NhadwmwYUzxec++S3PNPAOATSb7PL5l IZkfUkW718kiB4o/9yJcG7IFpCmYw8mR3ultlSg9wPzeq482LhpG8IevxD3mL8y+C+x4 1WBA== 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=VjdfW5MWjFO5vspsyG+fi+mIgP6Or6hxJg1O0dMbsYk=; b=Yd8asTyJ6O8Y6W3ZYN+ocuvgpXJ4kcfYbj+K2fra/1LTrKKfgxbdTWFiTCPqq5rQ3C aM64gU8E2Zg+rov3RuHFPYe50oWVBHixCf4BaZvmj7ykOFcTQryw1Hy+7vAW6KDHcf3c p309/mvCGkibz09EPs3i+ClS1XAbdfbL63q4mrnsNF9b0mdqpZjdW12q8CoMR428Vujy tgdNsKGkz7HZ8EkL4NXrybMwK8FrPaxuEDjpw8HE6a5lkVm79rDqNbRoHYIsA/OtjMpH zSzHyaEsEdvTQNzVGEHPsL2uGFLqPRo+gvJf/ah133CL00KrKwWTybOJJ3l6vzT0K2kd 1eGg== X-Gm-Message-State: APjAAAVo7eizNUwrdzbGLRp9FKbpIjtYH4a7R0McIXcOo5pBnI3x3/b4 zB0tVajyFumjqHLrVwI8+sicuDxycd8= X-Google-Smtp-Source: APXvYqwWop/K1CtLgR2K1yBgCai8SxgWaQSmQYr1lBxWaw4gFeWfVdis40Vdj/qh6Dh4YevQY6c2Ww== X-Received: by 2002:a1c:be09:: with SMTP id o9mr9235043wmf.3.1552053468903; Fri, 08 Mar 2019 05:57:48 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id o12sm13488539wrx.53.2019.03.08.05.57.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Mar 2019 05:57:48 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Date: Fri, 8 Mar 2019 13:57:43 +0000 Message-Id: <20190308135744.6480-3-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190308135744.6480-1-peter.maydell@linaro.org> References: <20190308135744.6480-1-peter.maydell@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::342 Subject: [Qemu-devel] [PATCH 2/3] Makefile: Fix 'make distclean' X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , patches@linaro.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP We forgot the '-r' option on the rm command to clean up the Sphinx .doctrees working directory, which meant that "make distclean" fails: rm: cannot remove '.doctrees': Is a directory Add the missing option. Fixes: 5f71eac06e15b9a3fa1134d446f ("Makefile, configure: Support building rST documentation") Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 0194ef7fa55..9fd7f3f9bfb 100644 --- a/Makefile +++ b/Makefile @@ -691,7 +691,7 @@ distclean: clean rm -f docs/interop/qemu-qmp-ref.html docs/interop/qemu-ga-ref.html rm -f docs/qemu-block-drivers.7 rm -f docs/qemu-cpu-models.7 - rm -f .doctrees + rm -rf .doctrees $(call clean-manual,devel) $(call clean-manual,interop) for d in $(TARGET_DIRS); do \ From patchwork Fri Mar 8 13:57:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 10844951 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 12A5B1575 for ; Fri, 8 Mar 2019 14:00:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F3D982E42C for ; Fri, 8 Mar 2019 14:00:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E7D042E513; Fri, 8 Mar 2019 14:00:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C90B12E4F0 for ; Fri, 8 Mar 2019 14:00:32 +0000 (UTC) Received: from localhost ([127.0.0.1]:44074 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h2G35-0005iA-R8 for patchwork-qemu-devel@patchwork.kernel.org; Fri, 08 Mar 2019 09:00:31 -0500 Received: from eggs.gnu.org ([209.51.188.92]:47798) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h2G0Z-0004Pe-Cm for qemu-devel@nongnu.org; Fri, 08 Mar 2019 08:57:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h2G0Y-0002sZ-Jc for qemu-devel@nongnu.org; Fri, 08 Mar 2019 08:57:55 -0500 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:36849) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h2G0Y-0002bF-CO for qemu-devel@nongnu.org; Fri, 08 Mar 2019 08:57:54 -0500 Received: by mail-wr1-x441.google.com with SMTP id o17so21480640wrw.3 for ; Fri, 08 Mar 2019 05:57:51 -0800 (PST) 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=HMdIIL9N10bCjfV53ccNATyrVd9+H+BfOKUx2mDzRRQ=; b=tfrh9HzzJVyg4RBupQJg1/sf6SIS5rJwRP9rcOzLxCucP1pzxr/6odrQ23tmu0LG3N cGvh8dBxdCWkQm+JUTm8KBfmzY4Ji2Nc2KD5A6APM4asN5QAydDhqFVO9V8AhLM1KNp3 yNP6P4dKgObOP+B+GgsG63WlquSNeG+rGkSVG1C7i9lnXEiOIZ/LZp7i0dYdpFiaY82s kC4GBUDQzCvqwLlahwEIZZEqg69uXp/JzI8Uo3sUs6wgw43AA8fZG71u5VGp5X+gQA8k ctykJ+lqQju91PxH/I0ZeFQLtuTOpkfPzTlaz+bzoLRx4qqvF8DAtFY5kiPGIHl18by5 /93A== 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=HMdIIL9N10bCjfV53ccNATyrVd9+H+BfOKUx2mDzRRQ=; b=Ja2q7dtq4eD5144dXU22+5c6PM3VAMhW6y6n6Wwx/VXPKgMnVmVKjvGdnNAGz70zNV Zz9HQ+L+XnRqy7sAT2HbJP21m62J8qbjVFnjJrPl14et2g+GmaSNn9Zsi5Xju/syVWv2 zY2cNbBSW0xhK2BtnKBFAp4MX9/KHSheQlAFJ43bySIEhdpgiCq1fLm0rbFkoClMH6Ot F3UKGpr89M5Db+k6JiahTLYhXdS1oApLPSPAN93pxCNXOQNgRpPFXPc0z88NyQNHjnJX ibDbloyCBORa/IGgNAOUy15XnxKwonKSkzN+yPpdYn/duat152cX7wOpAhDu+zs5nOmj SDIg== X-Gm-Message-State: APjAAAVI6uRFVsNbtgqILYf0Lh9wdN+UxaV9owXAhWOHP1du4OO+Wa4I SubIsofFMJhvXoe08GBN3Iq9A45CoEg= X-Google-Smtp-Source: APXvYqxJdAdbOvwNGpE/4OEeDE6Y6xDsepwtkkMfm6AnOcf9TwlBsAaqnXZbya1sQkTzZ23lZMwE+w== X-Received: by 2002:adf:ee4d:: with SMTP id w13mr11278240wro.16.1552053469976; Fri, 08 Mar 2019 05:57:49 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id o12sm13488539wrx.53.2019.03.08.05.57.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Mar 2019 05:57:49 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Date: Fri, 8 Mar 2019 13:57:44 +0000 Message-Id: <20190308135744.6480-4-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190308135744.6480-1-peter.maydell@linaro.org> References: <20190308135744.6480-1-peter.maydell@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::441 Subject: [Qemu-devel] [PATCH 3/3] Makefile: Don't install non-sphinx files in sphinx docs install X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , patches@linaro.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP If we're doing an out-of-tree build of Sphinx, then we copy some extra spurious files to the install directory as part of 'make install': qemu-ga-qapi.texi qemu-ga-ref.7 qemu-ga-ref.7.pod qemu-ga-ref.html qemu-ga-ref.txt qemu-qmp-qapi.texi qemu-qmp-ref.7 qemu-qmp-ref.7.pod qemu-qmp-ref.html qemu-qmp-ref.txt because these have been built into build/docs/interop along with the Sphinx interop documents. Filter them out of the set of files we install when we're installing the Sphinx-built manual files. (They are installed into their correct locations as part of the main install-doc target already.) Fixes: 5f71eac06e15b9a3fa1134d446f ("Makefile, configure: Support building rST documentation") Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 9fd7f3f9bfb..6ccb8639b08 100644 --- a/Makefile +++ b/Makefile @@ -727,9 +727,11 @@ else BLOBS= endif +# Note that we manually filter-out the non-Sphinx documentation which +# is currently built into the docs/interop directory in the build tree. define install-manual = for d in $$(cd $(MANUAL_BUILDDIR) && find $1 -type d); do $(INSTALL_DIR) "$(DESTDIR)$(qemu_docdir)/$$d"; done -for f in $$(cd $(MANUAL_BUILDDIR) && find $1 -type f); do $(INSTALL_DATA) "$(MANUAL_BUILDDIR)/$$f" "$(DESTDIR)$(qemu_docdir)/$$f"; done +for f in $$(cd $(MANUAL_BUILDDIR) && find $1 -type f -a '!' '(' -name 'qemu-*-qapi.*' -o -name 'qemu-*-ref.*' ')' ); do $(INSTALL_DATA) "$(MANUAL_BUILDDIR)/$$f" "$(DESTDIR)$(qemu_docdir)/$$f"; done endef # Note that we deliberately do not install the "devel" manual: it is