[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#28719] [PATCH 3/6] gnu: qwt: Adjust installation directory layout.
From: |
Hartmut Goebel |
Subject: |
[bug#28719] [PATCH 3/6] gnu: qwt: Adjust installation directory layout. |
Date: |
Fri, 6 Oct 2017 14:02:11 +0200 |
From: 宋文武 <address@hidden>
* 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 88e0011b1..f9f1278c7 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1600,11 +1600,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")))
--
2.13.5
- [bug#28719] [PATCH 1/6] gnu: qtbase: Use a more standard directory layout., (continued)
- [bug#28719] [PATCH 1/6] gnu: qtbase: Use a more standard directory layout., Hartmut Goebel, 2017/10/06
- [bug#28719] [PATCH 2/6] gnu: qt: Fix install paths in submodules., Hartmut Goebel, 2017/10/06
- [bug#28719] [PATCH 5/6] gnu: qscintilla: Adjust installation directory layout., Hartmut Goebel, 2017/10/06
- [bug#28719] [PATCH 5/6] gnu: qscintilla: Adjust installation directory layout., 宋文武, 2017/10/10
- [bug#28719] [PATCH 5/6] gnu: qscintilla: Adjust installation directory layout., Hartmut Goebel, 2017/10/10
- [bug#28719] [PATCH 5/6] gnu: qscintilla: Adjust installation directory layout., Hartmut Goebel, 2017/10/10
- [bug#28719] [PATCH 5/6] gnu: qscintilla: Adjust installation directory layout., 宋文武, 2017/10/12
- bug#28719: [PATCH 5/6] gnu: qscintilla: Adjust installation directory layout., Hartmut Goebel, 2017/10/13
- [bug#28719] [PATCH 5/6] gnu: qscintilla: Adjust installation directory layout., 宋文武, 2017/10/14
[bug#28719] [PATCH 3/6] gnu: qwt: Adjust installation directory layout.,
Hartmut Goebel <=
[bug#28719] [PATCH 4/6] gnu: qtwebkit: Fix rpath for the qmlwebkit plugins., Hartmut Goebel, 2017/10/06
[bug#28719] [PATCH 6/6] gnu: kde-framworks: Fix installation directories., Hartmut Goebel, 2017/10/06