From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mark H Weaver Subject: [PATCHES] Fix misplaced man pages in ncurses and bzip2 Date: Wed, 19 Mar 2014 12:12:15 -0400 Message-ID: <87k3bqqiao.fsf@yeeloong.lan> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:52072) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQJ72-0001Ee-RE for guix-devel@gnu.org; Wed, 19 Mar 2014 12:13:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WQJ6y-0002Zz-AA for guix-devel@gnu.org; Wed, 19 Mar 2014 12:13:04 -0400 Received: from world.peace.net ([96.39.62.75]:53963) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQJ6y-0002Vw-53 for guix-devel@gnu.org; Wed, 19 Mar 2014 12:13:00 -0400 List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org --=-=-= Content-Type: text/plain These are for core-updates. I've tested them both. Mark --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-ncurses-Install-man-pages-in-share-man-man-not-m.patch Content-Transfer-Encoding: quoted-printable Content-Description: [PATCH 1/2] gnu: ncurses: Install man pages in share/man/man*, not man/man* >From b1d5f5da8417dbd2213b92c1881f9e408d02dad9 Mon Sep 17 00:00:00 2001 From: Mark H Weaver 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 =C2=A9 2012, 2013 Ludovic Court=C3=A8s +;;; Copyright =C2=A9 2014 Mark H Weaver ;;; ;;; This file is part of GNU Guix. ;;; @@ -99,6 +100,11 @@ ,(string-append "--includedir=3D" (assoc-ref %outputs "out") "/include") =20 + ;; By default man pages land in PREFIX/man, but we want them + ;; in PREFIX/share/man. + ,(string-append "--mandir=3D" (assoc-ref %outputs "out") + "/share/man") + ;; C++ bindings fail to build on ;; `i386-pc-solaris2.11' with GCC 3.4.3: ;; . --=20 1.8.4 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0002-gnu-bzip2-Install-man-pages-to-share-man-man1-not-sh.patch Content-Transfer-Encoding: quoted-printable Content-Description: [PATCH 2/2] gnu: bzip2: Install man pages to share/man/man1, not share/man1 >From afd1cff14831ce85fde4418cc0b98287b0367a9a Mon Sep 17 00:00:00 2001 From: Mark H Weaver 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 =C2=A9 2012, 2013 Ludovic Court=C3=A8s ;;; Copyright =C2=A9 2013 Andreas Enge +;;; Copyright =C2=A9 2014 Mark H Weaver ;;; ;;; 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) --=20 1.8.4 --=-=-=--