all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Hartmut Goebel <h.goebel@crazy-compilers.com>
To: 28719@debbugs.gnu.org
Subject: [bug#28719] [PATCH 5/6] gnu: qscintilla: Adjust installation directory layout.
Date: Fri,  6 Oct 2017 14:02:13 +0200	[thread overview]
Message-ID: <20171006120214.29511-5-h.goebel@crazy-compilers.com> (raw)
In-Reply-To: <20171006120214.29511-1-h.goebel@crazy-compilers.com>

* gnu/packages/qt.scm (qscintilla)[#:phase configure]: Set QT_INSTALL_DATA and
  QT_HOST_DATA to $OUT/lib/qt5.
---
 gnu/packages/qt.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 1b5058ba1..775982757 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -1467,8 +1467,10 @@ contain over 620 classes.")
                   (string-append out "/include"))
                  (("\\$\\$\\[QT_INSTALL_TRANSLATIONS\\]")
                   (string-append out "/translations"))
-                 (("\\$\\$\\[QT_INSTALL_DATA\\]") out)
-                 (("\\$\\$\\[QT_HOST_DATA\\]") out))
+                 (("\\$\\$\\[QT_INSTALL_DATA\\]")
+                  (string-append out "/lib/qt$${QT_MAJOR_VERSION}"))
+                 (("\\$\\$\\[QT_HOST_DATA\\]")
+                 (string-append out "/lib/qt$${QT_MAJOR_VERSION}")))
                (zero? (system* "qmake"))))))))
     (native-inputs `(("qtbase" ,qtbase)))
     (home-page "http://www.riverbankcomputing.co.uk/software/qscintilla/intro")
-- 
2.13.5

  parent reply	other threads:[~2017-10-06 12:03 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-10-06 11:59 [bug#28719] [PATCH 0/6] Qt: Use a more standard directory layout Hartmut Goebel
2017-10-06 12:02 ` [bug#28719] [PATCH 1/6] gnu: qtbase: " Hartmut Goebel
2017-10-06 12:02   ` [bug#28719] [PATCH 2/6] gnu: qt: Fix install paths in submodules Hartmut Goebel
2017-10-10 11:01     ` 宋文武
2017-10-06 12:02   ` [bug#28719] [PATCH 3/6] gnu: qwt: Adjust installation directory layout Hartmut Goebel
2017-10-06 12:02   ` [bug#28719] [PATCH 4/6] gnu: qtwebkit: Fix rpath for the qmlwebkit plugins Hartmut Goebel
2017-10-06 12:02   ` Hartmut Goebel [this message]
2017-10-10 11:05     ` [bug#28719] [PATCH 5/6] gnu: qscintilla: Adjust installation directory layout 宋文武
2017-10-10 14:43       ` Hartmut Goebel
2017-10-10 15:39       ` Hartmut Goebel
2017-10-12 11:27         ` 宋文武
2017-10-13 13:37           ` bug#28719: " Hartmut Goebel
2017-10-14  6:30             ` [bug#28719] " 宋文武
2017-10-06 12:02   ` [bug#28719] [PATCH 6/6] gnu: kde-framworks: Fix installation directories Hartmut Goebel

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20171006120214.29511-5-h.goebel@crazy-compilers.com \
    --to=h.goebel@crazy-compilers.com \
    --cc=28719@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.