* [PATCH 1/2] build-system/gnu: Set the docdir to "share/doc"
@ 2014-02-10 20:35 John Darrington
2014-02-10 20:35 ` [PATCH 2/2] gnu: lout: Change docdir from "doc" " John Darrington
2014-02-10 21:29 ` [PATCH 1/2] build-system/gnu: Set the docdir " Ludovic Courtès
0 siblings, 2 replies; 4+ messages in thread
From: John Darrington @ 2014-02-10 20:35 UTC (permalink / raw)
To: guix-devel; +Cc: John Darrington
* guix/build/gnu-build-system.scm (configure):
Change docdir directory from "doc" to "share/doc".
---
guix/build/gnu-build-system.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/guix/build/gnu-build-system.scm b/guix/build/gnu-build-system.scm
index 65c9fcd..56e0450 100644
--- a/guix/build/gnu-build-system.scm
+++ b/guix/build/gnu-build-system.scm
@@ -160,7 +160,7 @@ makefiles."
'())
,@(if docdir
(list (string-append "--docdir=" docdir
- "/doc/" (package-name)))
+ "/share/doc/" (package-name)))
'())
,@(if target ; cross building
(list (string-append "--host=" target))
--
1.7.10.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] gnu: lout: Change docdir from "doc" to "share/doc"
2014-02-10 20:35 [PATCH 1/2] build-system/gnu: Set the docdir to "share/doc" John Darrington
@ 2014-02-10 20:35 ` John Darrington
2014-02-10 22:15 ` Ludovic Courtès
2014-02-10 21:29 ` [PATCH 1/2] build-system/gnu: Set the docdir " Ludovic Courtès
1 sibling, 1 reply; 4+ messages in thread
From: John Darrington @ 2014-02-10 20:35 UTC (permalink / raw)
To: guix-devel; +Cc: John Darrington
* gnu/packages/lout.scm (lout):
Change docdir from "doc" to "share/doc".
---
gnu/packages/lout.scm | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/lout.scm b/gnu/packages/lout.scm
index 76cb8a7..1121f16 100644
--- a/gnu/packages/lout.scm
+++ b/gnu/packages/lout.scm
@@ -37,14 +37,14 @@
(("^LOUTLIBDIR[[:blank:]]*=.*$")
(string-append "LOUTLIBDIR = " out "/lib/lout\n"))
(("^LOUTDOCDIR[[:blank:]]*=.*$")
- (string-append "LOUTDOCDIR = " doc "/doc/lout\n"))
+ (string-append "LOUTDOCDIR = " doc "/share/doc/lout\n"))
(("^MANDIR[[:blank:]]*=.*$")
(string-append "MANDIR = " out "/man\n")))
(mkdir out)
(mkdir (string-append out "/bin"))
(mkdir (string-append out "/lib"))
(mkdir (string-append out "/man"))
- (mkdir-p (string-append doc "/doc/lout")))))
+ (mkdir-p (string-append doc "/share/doc/lout")))))
(install-man-phase
'(lambda* (#:key outputs #:allow-other-keys)
(zero? (system* "make" "installman"))))
@@ -60,7 +60,7 @@
(every (lambda (doc)
(format #t "doc: building `~a'...~%" doc)
(with-directory-excursion doc
- (let ((file (string-append out "/doc/lout/"
+ (let ((file (string-append out "/share/doc/lout/"
doc ".ps")))
(and (or (file-exists? "outfile.ps")
(zero? (system* "lout" "-r4" "-o"
@@ -72,7 +72,7 @@
"-dPDFSETTINGS=/prepress"
"-sPAPERSIZE=a4"
file
- (string-append out "/doc/lout/"
+ (string-append out "/share/doc/lout/"
doc ".pdf")))))))
'("design" "expert" "slides" "user")))))
(package
--
1.7.10.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] build-system/gnu: Set the docdir to "share/doc"
2014-02-10 20:35 [PATCH 1/2] build-system/gnu: Set the docdir to "share/doc" John Darrington
2014-02-10 20:35 ` [PATCH 2/2] gnu: lout: Change docdir from "doc" " John Darrington
@ 2014-02-10 21:29 ` Ludovic Courtès
1 sibling, 0 replies; 4+ messages in thread
From: Ludovic Courtès @ 2014-02-10 21:29 UTC (permalink / raw)
To: John Darrington; +Cc: guix-devel
John Darrington <jmd@gnu.org> skribis:
> * guix/build/gnu-build-system.scm (configure):
> Change docdir directory from "doc" to "share/doc".
Applied to ‘core-updates’, thanks!
Ludo’.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] gnu: lout: Change docdir from "doc" to "share/doc"
2014-02-10 20:35 ` [PATCH 2/2] gnu: lout: Change docdir from "doc" " John Darrington
@ 2014-02-10 22:15 ` Ludovic Courtès
0 siblings, 0 replies; 4+ messages in thread
From: Ludovic Courtès @ 2014-02-10 22:15 UTC (permalink / raw)
To: John Darrington; +Cc: guix-devel
John Darrington <jmd@gnu.org> skribis:
> * gnu/packages/lout.scm (lout):
> Change docdir from "doc" to "share/doc".
Applied, thanks.
Ludo’.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-02-10 22:16 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-02-10 20:35 [PATCH 1/2] build-system/gnu: Set the docdir to "share/doc" John Darrington
2014-02-10 20:35 ` [PATCH 2/2] gnu: lout: Change docdir from "doc" " John Darrington
2014-02-10 22:15 ` Ludovic Courtès
2014-02-10 21:29 ` [PATCH 1/2] build-system/gnu: Set the docdir " Ludovic Courtès
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).