From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id eKGhMJBpBGWnNgEAauVa8A:P1 (envelope-from ) for ; Fri, 15 Sep 2023 16:26:24 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:478a::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id eKGhMJBpBGWnNgEAauVa8A (envelope-from ) for ; Fri, 15 Sep 2023 16:26:24 +0200 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 69AF5EA3A for ; Fri, 15 Sep 2023 16:26:24 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1694787984; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=weKxmU9yU5ollu1Igv81laJVItM7BaMkEg31OX0FV2A=; b=eFahHpY9ThGnOHpLYknwiL8m+JMWF0ls1JStEp6lH+drin0IbGAUecQG+mFM+ttvMmbckW upnF0TOtBn9Y4+fDeYKg3exR+ae87KZ+Ky4WykmBBEwqhFfZDbCxYAVyOdoWW+/VTdjGkD +Crgyq0L6EE5mVoTGLTUwMGInEjOlX0x6FA7cIQ1PtHXH50+3puWxcIyD0iEmCeRHsCMvR g+fcIAwXPGq3uqfDsNealt6AywpZHQ0wIAw68IYQzKoP8N8XeoVR00NvShrAJ4KdsMTaWa 5L/JYGH2y9O5SB34XXP+7HvvoixelgDt3tU90NDvNciwA6PEObrO2yF7bZ898Q== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1694787984; a=rsa-sha256; cv=none; b=CukGe5BkHDA2942FRbo+VDwpZihzd7PvPrqRMqMUEKeIOSXAHMd+nd2PA8ENknLCLONHY6 qflopoiDFLzbDvPxsrDdZ1o8lbOl1cUlWh6h+1f3LoetNqeIDMopdIUqm8uq5dha40Wf4h FXNvPYaMrCSjQStKO1eh6t3EXr3cFh+eL0i//ZT1T8kgiTuuGtuONFUTvSaBaQpl/vdCkZ UfcyYQdFeV/D2gs0r62WSjAYA4xsvu78ouH/o/2PWJorMTYO917EBlxqpabagGRytutHGG WuDRhaAQHB1iPG8lW0uf4lEpETnAScRH4I4AJfVOpnD+EhbGmMGKxw3hT+st6g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qh9ll-0004SE-6c; Fri, 15 Sep 2023 10:26:05 -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 1qh9lc-0004Ov-0v for guix-patches@gnu.org; Fri, 15 Sep 2023 10:25:56 -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 1qh9lb-0001tr-PC for guix-patches@gnu.org; Fri, 15 Sep 2023 10:25:55 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qh9li-0001rp-6s for guix-patches@gnu.org; Fri, 15 Sep 2023 10:26:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66001] [PATCH 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: Fri, 15 Sep 2023 14:26:02 +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.16947879297098 (code B ref 66001); Fri, 15 Sep 2023 14:26:02 +0000 Received: (at 66001) by debbugs.gnu.org; 15 Sep 2023 14:25:29 +0000 Received: from localhost ([127.0.0.1]:44420 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qh9lB-0001qQ-E9 for submit@debbugs.gnu.org; Fri, 15 Sep 2023 10:25:29 -0400 Received: from mailout.easymail.ca ([64.68.200.34]:49334) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qh9lA-0001qD-9a for 66001@debbugs.gnu.org; Fri, 15 Sep 2023 10:25:29 -0400 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 29F2563357 for <66001@debbugs.gnu.org>; Fri, 15 Sep 2023 14:25:16 +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 C6LpsU1SDsGw for <66001@debbugs.gnu.org>; Fri, 15 Sep 2023 14:25:15 +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 8406663338 for <66001@debbugs.gnu.org>; Fri, 15 Sep 2023 14:25:14 +0000 (UTC) From: Simon South Date: Fri, 15 Sep 2023 10:25:02 -0400 Message-ID: <4af5efd7ec061ee2ed93c77b638faf4da001a7d8.1694784333.git.simon@simonsouth.net> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -2.47 X-Spam-Score: -2.47 X-Migadu-Queue-Id: 69AF5EA3A X-Migadu-Scanner: mx0.migadu.com X-TUID: JjMIkcvHVpMw * 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 80efe2363d..bee6ab6543 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -1527,7 +1527,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)) @@ -1535,6 +1541,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 -- 2.41.0