[PATCHES] Fix misplaced man pages in ncurses and bzip2

[PATCHES] Fix misplaced man pages in ncurses and bzip2

[Mark H Weaver]

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

These are for core-updates.  I've tested them both.

     Mark



[-- Attachment #2: [PATCH 1/2] gnu: ncurses: Install man pages in share/man/man*, not man/man* --]
[-- Type: text/x-patch, Size: 1341 bytes --]

From b1d5f5da8417dbd2213b92c1881f9e408d02dad9 Mon Sep 17 00:00:00 2001
From: Mark H Weaver <mhw@netris.org>
Date: Wed, 19 Mar 2014 05:02:25 -0400
Subject: [PATCH 1/2] gnu: ncurses: Install man pages in share/man/man*, not
 man/man*.

* gnu/packages/ncurses.scm (ncurses): Add --mandir configure flag.
---
 gnu/packages/ncurses.scm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/gnu/packages/ncurses.scm b/gnu/packages/ncurses.scm
index 3e968a8..b8f6bc8 100644
--- a/gnu/packages/ncurses.scm
+++ b/gnu/packages/ncurses.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -99,6 +100,11 @@
           ,(string-append "--includedir=" (assoc-ref %outputs "out")
                           "/include")
 
+          ;; By default man pages land in PREFIX/man, but we want them
+          ;; in PREFIX/share/man.
+          ,(string-append "--mandir=" (assoc-ref %outputs "out")
+                          "/share/man")
+
           ;; C++ bindings fail to build on
           ;; `i386-pc-solaris2.11' with GCC 3.4.3:
           ;; <http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6395191>.
-- 
1.8.4


[-- Attachment #3: [PATCH 2/2] gnu: bzip2: Install man pages to share/man/man1, not share/man1 --]
[-- Type: text/x-patch, Size: 1392 bytes --]

From afd1cff14831ce85fde4418cc0b98287b0367a9a Mon Sep 17 00:00:00 2001
From: Mark H Weaver <mhw@netris.org>
Date: Wed, 19 Mar 2014 05:00:38 -0400
Subject: [PATCH 2/2] gnu: bzip2: Install man pages to share/man/man1, not
 share/man1.

* gnu/packages/compression.scm (bzip2)[fix-man-dir]: Rename "man"
  to "share/man", not "share".
---
 gnu/packages/compression.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 5275b8a..72f8006 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
+;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -100,7 +101,7 @@ file; as a result, it is often used in conjunction with \"tar\", resulting in
          '(lambda* (#:key outputs #:allow-other-keys)
             (with-directory-excursion (assoc-ref outputs "out")
               (mkdir "share")
-              (rename-file "man" "share"))))
+              (rename-file "man" "share/man"))))
         (build-shared-lib
          ;; Build a shared library.
          '(lambda* (#:key inputs #:allow-other-keys)
-- 
1.8.4

Re: [PATCHES] Fix misplaced man pages in ncurses and bzip2

[Ludovic Courtès]

Mark H Weaver <mhw@netris.org> skribis:

> These are for core-updates.  I've tested them both.

OK to push.  Thanks for taking care of this!

Ludo’.