From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:33898)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1e1tIX-0001RS-CC
	for guix-patches@gnu.org; Tue, 10 Oct 2017 08:06:15 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1e1tIR-0000Uy-OE
	for guix-patches@gnu.org; Tue, 10 Oct 2017 08:06:09 -0400
Received: from debbugs.gnu.org ([208.118.235.43]:50672)
	by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
	(Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
	id 1e1tIR-0000Ud-Ka
	for guix-patches@gnu.org; Tue, 10 Oct 2017 08:06:03 -0400
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1e1tIQ-0007zP-JI
	for guix-patches@gnu.org; Tue, 10 Oct 2017 08:06:03 -0400
Subject: [bug#28719] [PATCH 5/6] gnu: qscintilla: Adjust installation
	directory layout.
Resent-Message-ID: <handler.28719.B28719.150763713230671@debbugs.gnu.org>
From: iyzsong@member.fsf.org (=?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?=)
References: <20171006120214.29511-1-h.goebel@crazy-compilers.com>
	<20171006120214.29511-5-h.goebel@crazy-compilers.com>
Date: Tue, 10 Oct 2017 19:05:12 +0800
In-Reply-To: <20171006120214.29511-5-h.goebel@crazy-compilers.com> (Hartmut
	Goebel's message of "Fri, 6 Oct 2017 14:02:13 +0200")
Message-ID: <87efqb1cwn.fsf@member.fsf.org>
MIME-Version: 1.0
Content-Type: text/plain
List-Id: <guix-patches.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>,
	<mailto:guix-patches-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/guix-patches/>
List-Post: <mailto:guix-patches@gnu.org>
List-Help: <mailto:guix-patches-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>,
	<mailto:guix-patches-request@gnu.org?subject=subscribe>
Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org
Sender: "Guix-patches" <guix-patches-bounces+kyle=kyleam.com@gnu.org>
To: Hartmut Goebel <h.goebel@crazy-compilers.com>
Cc: 28719@debbugs.gnu.org

Hartmut Goebel <h.goebel@crazy-compilers.com> writes:

> * 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")

Idelly, With the previous "Fix install paths" patch, this substitute for
qscintilla.pro could be removed.  Can you check it?  Thanks!