From 7af3e0c8da764351c0760608e11f9ea91aedcba1 Mon Sep 17 00:00:00 2001 From: Benda Xu Date: Tue, 20 Feb 2018 10:52:42 +0900 Subject: [PATCH] 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 939a048d3d42..1a20b3dace60 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 ) } -- 2.26.2