summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorDavide Pesavento <pesa@gentoo.org>2015-05-10 14:27:29 +0000
committerDavide Pesavento <pesa@gentoo.org>2015-05-10 14:27:29 +0000
commita4793ceb7c81b1441758405b0e7d9c7b16661154 (patch)
treec5db3f116a6596b59b8699fc892c379bde4214ac /eclass
parentUse improved .prf files from Fedora. (diff)
downloadhistorical-a4793ceb7c81b1441758405b0e7d9c7b16661154.tar.gz
historical-a4793ceb7c81b1441758405b0e7d9c7b16661154.tar.bz2
historical-a4793ceb7c81b1441758405b0e7d9c7b16661154.zip
Add note to qt{4,5}_prepare_env()
Diffstat (limited to 'eclass')
-rw-r--r--eclass/qt4-build-multilib.eclass3
-rw-r--r--eclass/qt5-build.eclass3
2 files changed, 4 insertions, 2 deletions
diff --git a/eclass/qt4-build-multilib.eclass b/eclass/qt4-build-multilib.eclass
index 8969548fbc08..366cdaa24e75 100644
--- a/eclass/qt4-build-multilib.eclass
+++ b/eclass/qt4-build-multilib.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.14 2015/05/10 01:06:49 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt4-build-multilib.eclass,v 1.15 2015/05/10 14:27:29 pesa Exp $
# @ECLASS: qt4-build-multilib.eclass
# @MAINTAINER:
@@ -538,6 +538,7 @@ qt_native_use() {
# Prepares the environment for building Qt.
qt4_prepare_env() {
# setup installation directories
+ # note: keep paths in sync with qmake-utils.eclass
QT4_PREFIX=${EPREFIX}/usr
QT4_HEADERDIR=${QT4_PREFIX}/include/qt4
QT4_LIBDIR=${QT4_PREFIX}/$(get_libdir)/qt4
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 7d6570ad65aa..4df4f5db4d39 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v 1.16 2015/04/19 18:22:15 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/qt5-build.eclass,v 1.17 2015/05/10 14:27:29 pesa Exp $
# @ECLASS: qt5-build.eclass
# @MAINTAINER:
@@ -389,6 +389,7 @@ qt_use_disable_mod() {
# Prepares the environment for building Qt.
qt5_prepare_env() {
# setup installation directories
+ # note: keep paths in sync with qmake-utils.eclass
QT5_PREFIX=${EPREFIX}/usr
QT5_HEADERDIR=${QT5_PREFIX}/include/qt5
QT5_LIBDIR=${QT5_PREFIX}/$(get_libdir)