From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38842) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e0RLR-0000cr-SZ for guix-patches@gnu.org; Fri, 06 Oct 2017 08:03:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e0RLN-0006OD-SS for guix-patches@gnu.org; Fri, 06 Oct 2017 08:03:09 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:43594) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e0RLN-0006O8-PW for guix-patches@gnu.org; Fri, 06 Oct 2017 08:03:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1e0RLN-0006eT-HG for guix-patches@gnu.org; Fri, 06 Oct 2017 08:03:05 -0400 Subject: [bug#28719] [PATCH 5/6] gnu: qscintilla: Adjust installation directory layout. Resent-Message-ID: From: Hartmut Goebel Date: Fri, 6 Oct 2017 14:02:13 +0200 Message-Id: <20171006120214.29511-5-h.goebel@crazy-compilers.com> In-Reply-To: <20171006120214.29511-1-h.goebel@crazy-compilers.com> References: <20171006120214.29511-1-h.goebel@crazy-compilers.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 28719@debbugs.gnu.org * 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