* [bug#37963] [PATCH] gnu: scdoc: Set PREFIX instead of patching Makefile.
@ 2019-10-28 15:46 Brendan Tildesley
2019-10-28 22:01 ` bug#37963: " Marius Bakke
0 siblings, 1 reply; 2+ messages in thread
From: Brendan Tildesley @ 2019-10-28 15:46 UTC (permalink / raw)
To: 37963
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* bug#37963: [PATCH] gnu: scdoc: Set PREFIX instead of patching Makefile.
2019-10-28 15:46 [bug#37963] [PATCH] gnu: scdoc: Set PREFIX instead of patching Makefile Brendan Tildesley
@ 2019-10-28 22:01 ` Marius Bakke
0 siblings, 0 replies; 2+ messages in thread
From: Marius Bakke @ 2019-10-28 22:01 UTC (permalink / raw)
To: Brendan Tildesley, 37963-done
[-- Attachment #1: Type: text/plain, Size: 489 bytes --]
Brendan Tildesley <mail@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!
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-10-28 22:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-28 15:46 [bug#37963] [PATCH] gnu: scdoc: Set PREFIX instead of patching Makefile Brendan Tildesley
2019-10-28 22:01 ` bug#37963: " Marius Bakke
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).