commit: 7af3e0c8da764351c0760608e11f9ea91aedcba1
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 20 01:52:42 2018 +0000
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Tue Feb 20 01:55:41 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7af3e0c8
qt5-build.eclass: ${D}${QT5_ARCHDATADIR#${EPREFIX}}: keep EPREFIX.
${D}${QT5_ARCHDATADIR#${EPREFIX}} mean no EPREFIX at all.
${D}${QT5_ARCHDATADIR} is cleaner than
${ED}${QT5_ARCHDATADIR#${EPREFIX}}, so use it.
eclass/qt5-build.eclass | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 939a048d3d4..1a20b3dace6 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -844,8 +844,8 @@ qt5_install_module_config() {
# install also the original qconfig.pri
[[ ${PN} == qtcore && ${QT5_MINOR_VERSION} -ge 9 ]] && (
insinto "${QT5_ARCHDATADIR#${EPREFIX}}"/mkspecs/gentoo
- newins "${D}${QT5_ARCHDATADIR#${EPREFIX}}"/mkspecs/qconfig.pri
qconfig-qtcore.pri
- newins "${D}${QT5_ARCHDATADIR#${EPREFIX}}"/mkspecs/qmodule.pri
qmodule-qtcore.pri
+ newins "${D}${QT5_ARCHDATADIR}"/mkspecs/qconfig.pri
qconfig-qtcore.pri
+ newins "${D}${QT5_ARCHDATADIR}"/mkspecs/qmodule.pri
qmodule-qtcore.pri
)
}