guix-commits
[Top][All Lists]
Advanced

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

03/23: gnu: qwt: Adjust installation directory layout.


From: Hartmut Goebel
Subject: 03/23: gnu: qwt: Adjust installation directory layout.
Date: Fri, 22 Sep 2017 09:30:25 -0400 (EDT)

htgoebel pushed a commit to branch wip-qt-paths
in repository guix.

commit 022e7e960eef7d83bee20fc8e6ddbdf965e36a8d
Author: 宋文武 <address@hidden>
Date:   Thu Sep 7 21:19:54 2017 +0800

    gnu: qwt: Adjust installation directory layout.
    
    * gnu/packages/qt.scm (qwt)[arguments]<#:phases>: Modify 'qwtconfig.pri' to
    use a directory layout that matching qtbase.  Modify 'doc/doc.pro' to remove
    the misplaced installation of man pages.  Rename phase 
'install-documentation'
    to 'install-man-pages'.
---
 gnu/packages/qt.scm | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index a41aa4f..8070e27 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1588,11 +1588,27 @@ securely.  It will not store any data unencrypted 
unless explicitly requested.")
      (modify-phases %standard-phases
        (replace 'configure
          (lambda* (#:key outputs #:allow-other-keys)
-           (let ((out (assoc-ref outputs "out")))
+           (let* ((out (assoc-ref outputs "out"))
+                  (docdir (string-append out "/share/doc/qwt"))
+                  (incdir (string-append out "/include/qwt"))
+                  (pluginsdir (string-append out "/lib/qt5/plugins/designer"))
+                  (featuresdir (string-append out 
"/lib/qt5/mkspecs/features")))
              (substitute* '("qwtconfig.pri")
-               (("/usr/local/qwt-\\$\\$QWT\\_VERSION") out))
+               (("^(\\s*QWT_INSTALL_PREFIX)\\s*=.*" _ x)
+                (format #f "~a = ~a\n" x out))
+               (("^(QWT_INSTALL_DOCS)\\s*=.*" _ x)
+                (format #f "~a = ~a\n" x docdir))
+               (("^(QWT_INSTALL_HEADERS)\\s*=.*" _ x)
+                (format #f "~a = ~a\n" x incdir))
+               (("^(QWT_INSTALL_PLUGINS)\\s*=.*" _ x)
+                (format #f "~a = ~a\n" x pluginsdir))
+               (("^(QWT_INSTALL_FEATURES)\\s*=.*" _ x)
+                (format #f "~a = ~a\n" x featuresdir)))
+             (substitute* '("doc/doc.pro")
+               ;; We'll install them in the 'install-man-pages' phase.
+               (("^unix:doc\\.files.*") ""))
              (zero? (system* "qmake")))))
-       (add-after 'install 'install-documentation
+       (add-after 'install 'install-man-pages
          (lambda* (#:key outputs #:allow-other-keys)
            (let* ((out (assoc-ref outputs "out"))
                   (man (string-append out "/share/man")))



reply via email to

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