From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mark H Weaver Subject: [PATCHES] Fixes to install docs in the standard places Date: Thu, 20 Mar 2014 04:28:41 -0400 Message-ID: <87bnx1p93a.fsf@yeeloong.lan> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:55557) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQYLr-00024S-03 for guix-devel@gnu.org; Thu, 20 Mar 2014 04:29:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WQYLm-0004tx-8l for guix-devel@gnu.org; Thu, 20 Mar 2014 04:29:22 -0400 Received: from world.peace.net ([96.39.62.75]:54844) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WQYLm-0004to-2K for guix-devel@gnu.org; Thu, 20 Mar 2014 04:29:18 -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 patches fix 'netcat', 'screen', 'unzip', and 'bc' to install their docs in PREFIX/share/{man,info} instead of PREFIX/{man,info}. Mark --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-netcat-Install-docs-in-share-man-and-share-info.patch Content-Transfer-Encoding: quoted-printable Content-Description: [PATCH 1/4] gnu: netcat: Install docs in share/man and share/info >From b6079ab1de07d726b5f1f53d4e35e0f32b9a4d0f Mon Sep 17 00:00:00 2001 From: Mark H Weaver 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 =C2=A9 2012, 2013, 2014 Ludovic Court=C3=A8s ;;; Copyright =C2=A9 2013 Cyril Roelandt +;;; Copyright =C2=A9 2014 Mark H Weaver ;;; ;;; 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=3D" out "/share/man") + (string-append "--infodir=3D" out "/share/info"))))) (home-page "http://netcat.sourceforge.net") (synopsis "Read and write data over TCP/IP") (description --=20 1.8.4 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0002-gnu-screen-Install-docs-in-share-man-and-share-info.patch Content-Transfer-Encoding: quoted-printable Content-Description: [PATCH 2/4] gnu: screen: Install docs in share/man and share/info >From db1540aa1db41741e937feae215d0ee787372a7c Mon Sep 17 00:00:00 2001 From: Mark H Weaver 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 =C2=A9 2013 Cyril Roelandt +;;; Copyright =C2=A9 2014 Mark H Weaver ;;; ;;; 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=3D" out "/share/man") + (string-append "--infodir=3D" out "/share/info"))))) (home-page "http://www.gnu.org/software/screen/") (synopsis "Full-screen window manager providing multiple terminals") (description --=20 1.8.4 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0003-gnu-unzip-Install-man-pages-in-share-man.patch Content-Transfer-Encoding: quoted-printable Content-Description: [PATCH 3/4] gnu: unzip: Install man pages in share/man >From 30e88645fdb925904053fdb8d124176f2d105bba Mon Sep 17 00:00:00 2001 From: Mark H Weaver 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 Makefil= e. --- 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 =C2=A9 2013 Andreas Enge +;;; Copyright =C2=A9 2014 Mark H Weaver ;;; ;;; This file is part of GNU Guix. ;;; @@ -89,7 +90,9 @@ Compression ratios of 2:1 to 3:1 are common for text file= s.") (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") --=20 1.8.4 --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0004-gnu-bc-Install-docs-in-share-man-and-share-info.patch Content-Transfer-Encoding: quoted-printable Content-Description: [PATCH 4/4] gnu: bc: Install docs in share/man and share/info >From 17e41a66d2704e9a5f00811e54577ea312e0313c Mon Sep 17 00:00:00 2001 From: Mark H Weaver 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 =C2=A9 2012, 2013 Andreas Enge ;;; Copyright =C2=A9 2013 Ludovic Court=C3=A8s +;;; Copyright =C2=A9 2014 Mark H Weaver ;;; ;;; This file is part of GNU Guix. ;;; @@ -179,8 +180,14 @@ GP2C, the GP to C compiler, translates GP scripts to P= ARI programs.") (let ((out (assoc-ref outputs "out"))) (setenv "CONFIG_SHELL" (which "bash")) (zero? - (system* "./configure" - (string-append "--prefix=3D" out))))) + (system* + "./configure" + (string-append "--prefix=3D" 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=3D" out "/share/man") + (string-append "--infodir=3D" out "/share/info= "))))) %standard-phases))) (home-page "http://www.gnu.org/software/bc/") (synopsis "Arbitrary precision numeric processing language") --=20 1.8.4 --=-=-=--