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