GNU bug report logs - #37963
[PATCH] gnu: scdoc: Set PREFIX instead of patching Makefile.

Previous Next

Full log

View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: Marius Bakke <mbakke <at> fastmail.com>
Cc: tracker <at> debbugs.gnu.org
Subject: bug#37963: closed ([PATCH] gnu: scdoc: Set PREFIX instead of
 patching Makefile.)
Date: Mon, 28 Oct 2019 22:02:03 +0000

[Message part 1 (text/plain, inline)]

Your message dated Mon, 28 Oct 2019 23:01:07 +0100
with message-id <87y2x4ttr0.fsf <at> devup.no>
and subject line Re: [bug#37963] [PATCH] gnu: scdoc: Set PREFIX instead of patching Makefile.
has caused the debbugs.gnu.org bug report #37963,
regarding [PATCH] gnu: scdoc: Set PREFIX instead of patching Makefile.
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs <at> gnu.org.)


-- 
37963: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=37963
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems

[Message part 2 (message/rfc822, inline)]

From: Brendan Tildesley <mail <at> brendan.scot>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: scdoc: Set PREFIX instead of patching Makefile.
Date: Tue, 29 Oct 2019 00:46:33 +0900

scdoc installs a scdoc.pc file in lib/pkgconfig, but it embeds
prefix=/usr/local unless the Makefile was patched before 'build. However, it
seemed better to simply set the PREFIX make-flag instead, since the Makefile
correctly checks for it. Diffoscope shows the output is identical with either
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=gcc")
+    `(#:make-flags
+      (list "CC=gcc" (string-append "PREFIX=" (assoc-ref %outputs "out")))
       #: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
-- 
2.23.0

[Message part 3 (message/rfc822, inline)]

From: Marius Bakke <mbakke <at> fastmail.com>
To: Brendan Tildesley <mail <at> brendan.scot>, 37963-done <at> debbugs.gnu.org
Subject: Re: [bug#37963] [PATCH] gnu: scdoc: Set PREFIX instead of patching
 Makefile.
Date: Mon, 28 Oct 2019 23:01:07 +0100

[Message part 4 (text/plain, inline)]

Brendan Tildesley <mail <at> brendan.scot> writes:

> scdoc installs a scdoc.pc file in lib/pkgconfig, but it embeds
> prefix=/usr/local unless the Makefile was patched before 'build. However, it
> seemed better to simply set the PREFIX make-flag instead, since the Makefile
> correctly checks for it. Diffoscope shows the output is identical with either
> method.
>
> * gnu/packages/man.scm (scdoc)[arguments]: Set PREFIX instead of patching
> Makefile with output path.

Good catch, applied!

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.