From debbugs-submit-bounces@debbugs.gnu.org Mon Oct 28 11:47:00 2019 Received: (at submit) by debbugs.gnu.org; 28 Oct 2019 15:47:00 +0000 Received: from localhost ([127.0.0.1]:46229 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iP7ES-0002cP-D8 for submit@debbugs.gnu.org; Mon, 28 Oct 2019 11:47:00 -0400 Received: from lists.gnu.org ([209.51.188.17]:48422) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iP7EQ-0002cI-Fw for submit@debbugs.gnu.org; Mon, 28 Oct 2019 11:46:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59751) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iP7EO-0002H6-Ag for guix-patches@gnu.org; Mon, 28 Oct 2019 11:46:57 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=BAYES_40,URIBL_BLOCKED autolearn=disabled version=3.3.2 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iP7EM-0008K9-Hb for guix-patches@gnu.org; Mon, 28 Oct 2019 11:46:55 -0400 Received: from mout-p-201.mailbox.org ([80.241.56.171]:44142) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iP7EM-0008EW-7K for guix-patches@gnu.org; Mon, 28 Oct 2019 11:46:54 -0400 Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 471zbk3cxrzQl94 for ; Mon, 28 Oct 2019 16:46:42 +0100 (CET) X-Virus-Scanned: amavisd-new at heinlein-support.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1572277600; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=rKfBBtC/0UuQ2G7+c+u7tCPvOZLlmdHJFp7vdyszSk4=; b=W9OfkqAwuoqqQlAd1lGTlcqQQ686R3Ny8RZMXoQBblsthBwnDVIzyOvtKXnwcnkP/FlU10 HyNX4D9Zardk6ssXUiUkDevB5ncLPa9NpKbcQV688tpDZ9izSrXeHuLQ77EY/qovQGE1e4 QuBha/NXMpbJ2ifGzuWkz5l1DJc+42yzdggDqHyxaQGALf7aHXw3BSO/roWLzr37/xuvoM pUsq4vu7M56dcHKpTXYXIlJusj4djZg5Dbt5UUDRSyKngOUg6dkzAbDL79Ozc9OtmOIwWR XiUQFBeziFpxD8CdbGC1nYk/SiekQp8LxBzNHRthiXErI+WqHMd/oRNIl5ln+Q== Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter02.heinlein-hosting.de (spamfilter02.heinlein-hosting.de [80.241.56.116]) (amavisd-new, port 10030) with ESMTP id wfAIViy7JrA8 for ; Mon, 28 Oct 2019 16:46:39 +0100 (CET) From: Brendan Tildesley To: guix-patches@gnu.org Subject: [PATCH] gnu: scdoc: Set PREFIX instead of patching Makefile. Date: Tue, 29 Oct 2019 00:46:33 +0900 Message-Id: <20191028154633.3483-1-mail@brendan.scot> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 80.241.56.171 X-Spam-Score: -1.6 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.6 (--) scdoc installs a scdoc.pc file in lib/pkgconfig, but it embeds prefix=3D/usr/local unless the Makefile was patched before 'build. Howeve= r, it seemed better to simply set the PREFIX make-flag instead, since the Makef= ile correctly checks for it. Diffoscope shows the output is identical with ei= ther method. * gnu/packages/man.scm (scdoc)[arguments]: Set PREFIX instead of patching Makefile with output path. --- gnu/packages/man.scm | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/gnu/packages/man.scm b/gnu/packages/man.scm index de2377a14e..dc55e0a4ed 100644 --- a/gnu/packages/man.scm +++ b/gnu/packages/man.scm @@ -251,15 +251,11 @@ automatically.") "00zc3rzj97gscby31djlqyczvqpyhrl66i44czwzmmn7rc5j03m1")))) (build-system gnu-build-system) (arguments - `(#:make-flags '("CC=3Dgcc") + `(#:make-flags + (list "CC=3Dgcc" (string-append "PREFIX=3D" (assoc-ref %outputs "o= ut"))) #:phases (modify-phases %standard-phases - (delete 'configure) - (add-before 'install 'hardcode-paths - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "Makefile" - (("/usr/local") (assoc-ref outputs "out"))) - #t))))) + (delete 'configure)))) (home-page "https://git.sr.ht/~sircmpwn/scdoc") (synopsis "Simple man page generator") (description "scdoc is a simple man page generator written for POSIX = systems --=20 2.23.0