From patchwork Wed Sep 27 14:55:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon South X-Patchwork-Id: 54353 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B8E8F27BBEA; Wed, 27 Sep 2023 15:57:16 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 30D3027BBE2 for ; Wed, 27 Sep 2023 15:57:16 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qlVyA-000567-J6; Wed, 27 Sep 2023 10:56:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qlVy5-00051o-RM for guix-patches@gnu.org; Wed, 27 Sep 2023 10:56:49 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qlVy5-0007dc-Ig for guix-patches@gnu.org; Wed, 27 Sep 2023 10:56:49 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qlVyJ-0007P0-4Y for guix-patches@gnu.org; Wed, 27 Sep 2023 10:57:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66001] [PATCH v2 3/4] gnu: ucsim: Move documentation to "doc" output. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Sep 2023 14:57:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66001 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66001@debbugs.gnu.org Received: via spool by 66001-submit@debbugs.gnu.org id=B66001.169582657328335 (code B ref 66001); Wed, 27 Sep 2023 14:57:03 +0000 Received: (at 66001) by debbugs.gnu.org; 27 Sep 2023 14:56:13 +0000 Received: from localhost ([127.0.0.1]:52243 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qlVxV-0007Mt-8P for submit@debbugs.gnu.org; Wed, 27 Sep 2023 10:56:13 -0400 Received: from mailout.easymail.ca ([64.68.200.34]:53318) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qlVxS-0007M8-7O for 66001@debbugs.gnu.org; Wed, 27 Sep 2023 10:56:11 -0400 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 4F6D5641E2 for <66001@debbugs.gnu.org>; Wed, 27 Sep 2023 14:55:51 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo09-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo09-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id rp3qJVLUSGev for <66001@debbugs.gnu.org>; Wed, 27 Sep 2023 14:55:50 +0000 (UTC) Received: from localhost.localdomain (23-233-96-210.cpe.pppoe.ca [23.233.96.210]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id AD46364035 for <66001@debbugs.gnu.org>; Wed, 27 Sep 2023 14:55:50 +0000 (UTC) From: Simon South Date: Wed, 27 Sep 2023 10:55:36 -0400 Message-ID: <7939dfd0b6334965028b4bc44c41e3c8d1623092.1695823937.git.simon@simonsouth.net> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/embedded.scm (ucsim)[arguments]<#:phases>: Expand "patch-makefiles" phase to set correct documentation-installation path. [outputs]: Add with "out", "doc". --- gnu/packages/embedded.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index 517e5bcbf2..6a21a71d07 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -1610,7 +1610,13 @@ (define-public ucsim (add-after 'unpack 'patch-makefiles (lambda _ (substitute* (find-files "." "(\\.mk$|\\.in$)") - (("/bin/sh") (which "sh")))))) + (("/bin/sh") (which "sh"))) + + ;; Ensure the documentation is installed to the correct path, + ;; without a duplicate "ucsim" segment (necessary as we are + ;; building μCsim outside of SDCC). + (substitute* "doc/Makefile.in" + (("@docdir@/ucsim") "@docdir@"))))) ;; μCsim's regression-test suite is of little use in this context since ;; it doesn't stop or return an error code when it encounters a problem. #:tests? #f)) @@ -1618,6 +1624,7 @@ (define-public ucsim (list ncurses)) (native-inputs (list bison flex)) + (outputs '("out" "doc")) (home-page "http://mazsola.iit.uni-miskolc.hu/ucsim/") (synopsis "Simulators for various microcontroller families") (description "μCsim is a collection of software simulators for