From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id CHlZOWdXxl9zUQAA0tVLHw (envelope-from ) for ; Tue, 01 Dec 2020 14:47:03 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id 2AwxNWdXxl/yGQAA1q6Kng (envelope-from ) for ; Tue, 01 Dec 2020 14:47:03 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 96A9694030E for ; Tue, 1 Dec 2020 14:47:03 +0000 (UTC) Received: from localhost ([::1]:43248 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kk6vm-00037R-IQ for larch@yhetil.org; Tue, 01 Dec 2020 09:47:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52004) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kk6up-0002i0-6T for guix-patches@gnu.org; Tue, 01 Dec 2020 09:46:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:46780) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kk6uo-0008U5-Un for guix-patches@gnu.org; Tue, 01 Dec 2020 09:46:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kk6uo-0004FB-RJ for guix-patches@gnu.org; Tue, 01 Dec 2020 09:46:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#44596] [PATCH v2 2/2] gnu: knot-resolver: Move manual, examples to separate "doc" output Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 01 Dec 2020 14:46:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44596 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 44596@debbugs.gnu.org Cc: Simon South Received: via spool by 44596-submit@debbugs.gnu.org id=B44596.160683394616269 (code B ref 44596); Tue, 01 Dec 2020 14:46:02 +0000 Received: (at 44596) by debbugs.gnu.org; 1 Dec 2020 14:45:46 +0000 Received: from localhost ([127.0.0.1]:58323 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kk6uY-0004EG-In for submit@debbugs.gnu.org; Tue, 01 Dec 2020 09:45:46 -0500 Received: from mailout.easymail.ca ([64.68.200.34]:57970) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kk6uT-0004Dm-KP for 44596@debbugs.gnu.org; Tue, 01 Dec 2020 09:45:42 -0500 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 5BB4720FC9; Tue, 1 Dec 2020 14:45:36 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo06-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo06-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id oimsaaCkUvGW; Tue, 1 Dec 2020 14:45:36 +0000 (UTC) Received: from localhost.localdomain (unknown [108.162.141.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id A55FD20EA8; Tue, 1 Dec 2020 14:45:33 +0000 (UTC) From: Simon South Date: Tue, 1 Dec 2020 09:45:20 -0500 Message-Id: X-Mailer: git-send-email 2.29.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: 4.21 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 96A9694030E X-Spam-Score: 4.21 X-Migadu-Scanner: ns3122888.ip-94-23-21.eu X-TUID: 7pWUZzYHy5sF * gnu/packages/dns.scm (knot-resolver)[outputs]: Add "doc" output. [arguments]: Add "move-doc" phase, which moves the manual (in both HTML and Info formats) and example configuration files to the "doc" output. --- gnu/packages/dns.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index f0c3d6a602..16313df73f 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -948,6 +948,7 @@ synthesis, and on-the-fly re-configuration.") (patches (search-patches "knot-resolver-fix-map-command-on-32-bit.patch")))) (build-system meson-build-system) + (outputs '("out" "doc")) (arguments '(#:configure-flags '("-Ddoc=enabled") #:phases @@ -962,6 +963,20 @@ synthesis, and on-the-fly re-configuration.") (add-after 'build 'build-doc (lambda _ (invoke "ninja" "doc"))) + (add-after 'install 'move-doc + (lambda* (#:key outputs #:allow-other-keys) + ;; Move the manual and the example configuration files to the + ;; "doc" output. + (let ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc"))) + (mkdir-p (string-append doc "/share/doc/knot-resolver")) + (for-each + (lambda (dir) + (rename-file (string-append out "/share/" dir) + (string-append doc "/share/" dir))) + '("doc/knot-resolver/examples" + "doc/knot-resolver/html" + "info"))))) (add-after 'install 'wrap-binary (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- 2.29.2