From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 0PwtCspnrV+XHAAA0tVLHw (envelope-from ) for ; Thu, 12 Nov 2020 16:50:18 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id CP3+BcpnrV8XRgAAbx9fmQ (envelope-from ) for ; Thu, 12 Nov 2020 16:50:18 +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 E7CB29403A6 for ; Thu, 12 Nov 2020 16:50:17 +0000 (UTC) Received: from localhost ([::1]:59020 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kdFnc-0008Bj-Ri for larch@yhetil.org; Thu, 12 Nov 2020 11:50:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47726) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kdFnP-0008At-2B for guix-patches@gnu.org; Thu, 12 Nov 2020 11:50:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:33929) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kdFnO-0001ND-P4 for guix-patches@gnu.org; Thu, 12 Nov 2020 11:50:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kdFnO-0008CT-Nw for guix-patches@gnu.org; Thu, 12 Nov 2020 11:50:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#44596] [PATCH 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: Thu, 12 Nov 2020 16:50: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@simonsouth.net Received: via spool by 44596-submit@debbugs.gnu.org id=B44596.160519974631443 (code B ref 44596); Thu, 12 Nov 2020 16:50:02 +0000 Received: (at 44596) by debbugs.gnu.org; 12 Nov 2020 16:49:06 +0000 Received: from localhost ([127.0.0.1]:45472 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kdFmU-0008B3-Cv for submit@debbugs.gnu.org; Thu, 12 Nov 2020 11:49:06 -0500 Received: from mailout.easymail.ca ([64.68.200.34]:46252) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kdFmS-0008AL-P1 for 44596@debbugs.gnu.org; Thu, 12 Nov 2020 11:49:04 -0500 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 7C7C9BF8FF; Thu, 12 Nov 2020 16:48:59 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo04-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo04-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id sfq0PqwjLz7f; Thu, 12 Nov 2020 16:48:59 +0000 (UTC) Received: from jupiter.simonsouth.net (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 DDD6CBF51A; Thu, 12 Nov 2020 16:48:56 +0000 (UTC) From: Simon South Date: Thu, 12 Nov 2020 11:48:43 -0500 Message-Id: <16947e2029bd6bc38008f1019493365c403b0ee2.1605198478.git.simon@simonsouth.net> X-Mailer: git-send-email 2.29.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -3.3 (---) 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-Scanner: ns3122888.ip-94-23-21.eu 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-Spam-Score: 3.99 X-TUID: 70xkREKuZHjI * gnu/packages/dns.scm (knot-resolver)[outputs]: Add "doc" output. [arguments]: Add "move-doc" phase, which moves the manual (in both its HTML and Info formats) and the 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 784473d85f..6698bbf918 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -946,6 +946,7 @@ synthesis, and on-the-fly re-configuration.") (base32 "0cwlipib3x88dr6cijqv2aps13b4ijv524wc85ns07rkldy2c948")))) (build-system meson-build-system) + (outputs '("out" "doc")) (arguments '(#:configure-flags '("-Ddoc=enabled") #:phases @@ -960,6 +961,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