bug#37963: closed ([PATCH] gnu: scdoc: Set PREFIX instead of patching Makefile.)

[GNU bug Tracking System]

Your message dated Mon, 28 Oct 2019 23:01:07 +0100
with message-id <address@hidden>
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
address@hidden.)


-- 
37963: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=37963
GNU Bug Tracking System
Contact address@hidden with problems
> --- Begin Message ---
>
>
>
> 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
>
>
>
>
> --- End Message ---

--- Begin Message --- Subject: Re: [bug#37963] [PATCH] gnu: scdoc: Set PREFIX instead of patching Makefile. Date: Mon, 28 Oct 2019 23:01:07 +0100 User-agent: Notmuch/0.29.1 (https://notmuchmail.org) Emacs/26.2 (x86_64-pc-linux-gnu)

Brendan Tildesley <address@hidden> 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
Description: PGP signature

--- End Message ---