guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/01: gnu: tcl: Pass --mandir to configure.


From: Mark H. Weaver
Subject: 01/01: gnu: tcl: Pass --mandir to configure.
Date: Wed, 07 Jan 2015 17:05:17 +0000

mhw pushed a commit to branch core-updates
in repository guix.

commit c9a465555388867725cf455066ab909c9610c2f5
Author: Mark H Weaver <address@hidden>
Date:   Wed Jan 7 11:56:13 2015 -0500

    gnu: tcl: Pass --mandir to configure.
    
    This partially reverts 9b1bf33081652210502c6ef34506e27a9bc60f06.
    "gnu: Remove a bunch of now unneeded '--mandir' configure flags."
    
    * gnu/packages/tcl.scm (tcl)[arguments]: Put back the --mandir configure 
flag,
      with a comment explaining why it's still needed.
---
 gnu/packages/tcl.scm |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/gnu/packages/tcl.scm b/gnu/packages/tcl.scm
index 2de2624..67510eb 100644
--- a/gnu/packages/tcl.scm
+++ b/gnu/packages/tcl.scm
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2013, 2014, 2015 Ludovic Courtès <address@hidden>
-;;; Copyright © 2014 Mark H Weaver <address@hidden>
+;;; Copyright © 2014, 2015 Mark H Weaver <address@hidden>
 ;;; Copyright © 2014 Eric Bavier <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -63,6 +63,14 @@
                                       "tclsh")))))
                   %standard-phases))
 
+       ;; By default, man pages are put in PREFIX/man, but we want them in
+       ;; PREFIX/share/man.  The 'validate-documentation-location' phase is
+       ;; not able to fix this up because the default install populates both
+       ;; PREFIX/man and 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.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]