[gentoo-commits] proj/qt:master commit in: eclass/

[Davide Pesavento]

commit:     82026b039b4bc8ddc597c8186b464dd08f6339e3
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  1 18:56:10 2018 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Feb  1 18:56:10 2018 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=82026b03

qt5-build.eclass: use a subshell for insinto+newins

 eclass/qt5-build.eclass | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index 963dba57..28d303e2 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -804,10 +804,11 @@ qt5_install_module_qconfigs() {
 		doins "${T}"/${PN}-qconfig.pri
 	)
 
-	if [[ ${PN} == qtcore && ${QT5_MINOR_VERSION} -ge 9 ]]; then
+	# 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
-	fi
+	)
 }
 
 # @FUNCTION: qt5_regenerate_global_qconfigs