[PATCHES] Fixes to install docs in the standard places

[Mark H Weaver <mhw@netris.org>]

[-- Attachment #1: Type: text/plain, Size: 148 bytes --]

These patches fix 'netcat', 'screen', 'unzip', and 'bc' to install their
docs in PREFIX/share/{man,info} instead of PREFIX/{man,info}.

      Mark


[-- Attachment #2: [PATCH 1/4] gnu: netcat: Install docs in share/man and share/info --]
[-- Type: text/x-patch, Size: 1514 bytes --]

From b6079ab1de07d726b5f1f53d4e35e0f32b9a4d0f Mon Sep 17 00:00:00 2001
From: Mark H Weaver <mhw@netris.org>
Date: Thu, 20 Mar 2014 03:45:29 -0400
Subject: [PATCH 1/4] gnu: netcat: Install docs in share/man and share/info.

* gnu/packages/admin.scm (netcat): Add --mandir and --infodir
  configure flags.
---
 gnu/packages/admin.scm | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index ffedfd3..89df1a9 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com>
+;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -317,6 +318,13 @@ ONC RPC numbers")
               (base32
                "1frjcdkhkpzk0f84hx6hmw5l0ynpmji8vcbaxg8h5k2svyxz0nmm"))))
     (build-system gnu-build-system)
+    (arguments
+     `(#:configure-flags
+       ;; By default, man and info pages are put in PREFIX/{man,info},
+       ;; but we want them in PREFIX/share/{man,info}.
+       (let ((out (assoc-ref %outputs "out")))
+         (list (string-append "--mandir=" out "/share/man")
+               (string-append "--infodir=" out "/share/info")))))
     (home-page "http://netcat.sourceforge.net")
     (synopsis "Read and write data over TCP/IP")
     (description
-- 
1.8.4


[-- Attachment #3: [PATCH 2/4] gnu: screen: Install docs in share/man and share/info --]
[-- Type: text/x-patch, Size: 1394 bytes --]

From db1540aa1db41741e937feae215d0ee787372a7c Mon Sep 17 00:00:00 2001
From: Mark H Weaver <mhw@netris.org>
Date: Thu, 20 Mar 2014 03:47:31 -0400
Subject: [PATCH 2/4] gnu: screen: Install docs in share/man and share/info.

* gnu/packages/screen.scm (screen): Add --mandir and --infodir
  configure flags.
---
 gnu/packages/screen.scm | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/gnu/packages/screen.scm b/gnu/packages/screen.scm
index bb11c58..58ee42a 100644
--- a/gnu/packages/screen.scm
+++ b/gnu/packages/screen.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2013 Cyril Roelandt <tipecaml@gmail.com>
+;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -39,6 +40,13 @@
     (inputs
      `(("ncurses", ncurses)
        ("perl" ,perl)))
+    (arguments
+     `(#:configure-flags
+       ;; By default, man and info pages are put in PREFIX/{man,info},
+       ;; but we want them in PREFIX/share/{man,info}.
+       (let ((out (assoc-ref %outputs "out")))
+         (list (string-append "--mandir=" out "/share/man")
+               (string-append "--infodir=" out "/share/info")))))
     (home-page "http://www.gnu.org/software/screen/")
     (synopsis "Full-screen window manager providing multiple terminals")
     (description
-- 
1.8.4


[-- Attachment #4: [PATCH 3/4] gnu: unzip: Install man pages in share/man --]
[-- Type: text/x-patch, Size: 1365 bytes --]

From 30e88645fdb925904053fdb8d124176f2d105bba Mon Sep 17 00:00:00 2001
From: Mark H Weaver <mhw@netris.org>
Date: Thu, 20 Mar 2014 03:49:22 -0400
Subject: [PATCH 3/4] gnu: unzip: Install man pages in share/man.

* gnu/packages/zip.scm (unzip): Substitute /share/man/ for /man/ in Makefile.
---
 gnu/packages/zip.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/zip.scm b/gnu/packages/zip.scm
index c0fd8c5..03f3bc2 100644
--- a/gnu/packages/zip.scm
+++ b/gnu/packages/zip.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
+;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -89,7 +90,9 @@ Compression ratios of 2:1 to 3:1 are common for text files.")
          (lambda* (#:key inputs outputs #:allow-other-keys)
            (let* ((out (assoc-ref outputs "out")))
              (copy-file "unix/Makefile" "Makefile")
-             (substitute* "Makefile" (("/usr/local") out))))
+             (substitute* "Makefile"
+               (("/usr/local") out)
+               (("/man/") "/share/man/"))))
         %standard-phases)))
     (home-page "http://www.info-zip.org/UnZip.html")
     (synopsis "Unzip decompression and file extraction utility")
-- 
1.8.4


[-- Attachment #5: [PATCH 4/4] gnu: bc: Install docs in share/man and share/info --]
[-- Type: text/x-patch, Size: 1924 bytes --]

From 17e41a66d2704e9a5f00811e54577ea312e0313c Mon Sep 17 00:00:00 2001
From: Mark H Weaver <mhw@netris.org>
Date: Thu, 20 Mar 2014 03:51:09 -0400
Subject: [PATCH 4/4] gnu: bc: Install docs in share/man and share/info.

* gnu/packages/algebra.scm (bc): Pass --mandir and --infodir to configure.
---
 gnu/packages/algebra.scm | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm
index faab4ed..a1564e0 100644
--- a/gnu/packages/algebra.scm
+++ b/gnu/packages/algebra.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2012, 2013 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2013 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -179,8 +180,14 @@ GP2C, the GP to C compiler, translates GP scripts to PARI programs.")
                         (let ((out (assoc-ref outputs "out")))
                           (setenv "CONFIG_SHELL" (which "bash"))
                           (zero?
-                           (system* "./configure"
-                                    (string-append "--prefix=" out)))))
+                           (system*
+                            "./configure"
+                            (string-append "--prefix=" out)
+                            ;; By default, man and info pages are put in
+                            ;; PREFIX/{man,info}, but we want them in
+                            ;; PREFIX/share/{man,info}.
+                            (string-append "--mandir=" out "/share/man")
+                            (string-append "--infodir=" out "/share/info")))))
                       %standard-phases)))
     (home-page "http://www.gnu.org/software/bc/")
     (synopsis "Arbitrary precision numeric processing language")
-- 
1.8.4