gnu: Remove a bunch of now unneeded '--mandir' configure flags.
This has become redundant with the 'validate-documentation-location'
phase introduced in commit d68fe74.
* gnu/packages/compression.scm (bzip2): Remove 'fix-man-dir' phase.
* gnu/packages/ncurses.scm (ncurses)[arguments]: Remove --mandir.
* gnu/packages/pth.scm (pth)[arguments]: Remove #:configure-flags.
* gnu/packages/tcl.scm (tcl)[arguments]: Likewise.
* gnu/packages/xiph.scm (flac)[arguments]: Likewise.
This commit is contained in:
Ludovic Courtès
parent
d8491ba563
commit
9b1bf33081
|
|
@ -1,5 +1,5 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
|
||||
;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
|
||||
;;;
|
||||
|
|
@ -115,13 +115,7 @@ file; as a result, it is often used in conjunction with \"tar\", resulting in
|
|||
(home-page "http://www.gnu.org/software/gzip/")))
|
||||
|
||||
(define-public bzip2
|
||||
(let ((fix-man-dir
|
||||
;; Move man pages to $out/share/.
|
||||
'(lambda* (#:key outputs #:allow-other-keys)
|
||||
(with-directory-excursion (assoc-ref outputs "out")
|
||||
(mkdir "share")
|
||||
(rename-file "man" "share/man"))))
|
||||
(build-shared-lib
|
||||
(let ((build-shared-lib
|
||||
;; Build a shared library.
|
||||
'(lambda* (#:key inputs #:allow-other-keys)
|
||||
(patch-makefile-SHELL "Makefile-libbz2_so")
|
||||
|
|
@ -171,20 +165,16 @@ file; as a result, it is often used in conjunction with \"tar\", resulting in
|
|||
`(alist-cons-before
|
||||
'build 'build-shared-lib ,build-shared-lib
|
||||
(alist-cons-after
|
||||
'install 'fix-man-dir ,fix-man-dir
|
||||
(alist-cons-after
|
||||
'install 'install-shared-lib ,install-shared-lib
|
||||
(alist-replace 'configure ,set-cross-environment
|
||||
%standard-phases))))
|
||||
'install 'install-shared-lib ,install-shared-lib
|
||||
(alist-replace 'configure ,set-cross-environment
|
||||
%standard-phases)))
|
||||
|
||||
;; Native compilation: build the shared library.
|
||||
`(alist-cons-before
|
||||
'build 'build-shared-lib ,build-shared-lib
|
||||
(alist-cons-after
|
||||
'install 'fix-man-dir ,fix-man-dir
|
||||
(alist-cons-after
|
||||
'install 'install-shared-lib ,install-shared-lib
|
||||
(alist-delete 'configure %standard-phases)))))
|
||||
'install 'install-shared-lib ,install-shared-lib
|
||||
(alist-delete 'configure %standard-phases))))
|
||||
|
||||
#:make-flags (list (string-append "PREFIX="
|
||||
(assoc-ref %outputs "out")))
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
|
|
@ -99,11 +99,6 @@
|
|||
,(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")
|
||||
|
||||
;; Make sure programs like 'tic', 'reset', and 'clear' have a
|
||||
;; correct RUNPATH.
|
||||
,(string-append "LDFLAGS=-Wl,-rpath=" (assoc-ref %outputs "out")
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2012 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2012, 2015 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
|
|
@ -37,12 +37,7 @@
|
|||
"0ckjqw5kz5m30srqi87idj7xhpw6bpki43mj07bazjm2qmh3cdbj"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:parallel-build? #f
|
||||
;; By default, man pages are put in PREFIX/man,
|
||||
;; but we want them in PREFIX/share/man.
|
||||
#:configure-flags (list (string-append "--mandir="
|
||||
(assoc-ref %outputs "out")
|
||||
"/share/man"))))
|
||||
'(#:parallel-build? #f))
|
||||
(home-page "http://www.gnu.org/software/pth")
|
||||
(synopsis "Portable thread library")
|
||||
(description
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2013, 2014 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
|
||||
;;;
|
||||
|
|
@ -63,12 +63,6 @@
|
|||
"tclsh")))))
|
||||
%standard-phases))
|
||||
|
||||
;; By default, man pages are put in PREFIX/man,
|
||||
;; but we want them in PREFIX/share/man.
|
||||
#:configure-flags (list (string-append "--mandir="
|
||||
(assoc-ref %outputs "out")
|
||||
"/share/man"))
|
||||
|
||||
;; XXX: There are a few test failures (related to HTTP, most
|
||||
;; likely related to name resolution), but that doesn't cause
|
||||
;; `make' to fail.
|
||||
|
|
|
|||
|
|
@ -202,12 +202,7 @@ OpenBSD's sndio.")
|
|||
"1p0hh190kqvpkbk1bbajd81jfbmkyl4fn2i7pggk2zppq6m68bgs"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:parallel-tests? #f
|
||||
;; By default, man pages are put in PREFIX/man,
|
||||
;; but we want them in PREFIX/share/man.
|
||||
#:configure-flags (list (string-append "--mandir="
|
||||
(assoc-ref %outputs "out")
|
||||
"/share/man"))))
|
||||
`(#:parallel-tests? #f))
|
||||
;; FIXME: configure also looks for xmms, input could be added once it exists
|
||||
(inputs `(("libogg" ,libogg)))
|
||||
(synopsis "Free lossless audio codec")
|
||||
|
|
|
|||
Loading…
Reference in New Issue