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

[Davide Pesavento]

commit:     b5add565b4d9e289ff9a4cfd70c7fec296a343a7
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 26 18:29:50 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Nov 26 18:29:50 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=b5add565

[dev-qt/qthelp:4] Sync.

Package-Manager: portage-2.2.14

---
 dev-qt/qthelp/qthelp-4.8.9999.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qthelp/qthelp-4.8.9999.ebuild b/dev-qt/qthelp/qthelp-4.8.9999.ebuild
index 0bb1a0f..55ad8ad 100644
--- a/dev-qt/qthelp/qthelp-4.8.9999.ebuild
+++ b/dev-qt/qthelp/qthelp-4.8.9999.ebuild
@@ -52,8 +52,8 @@ src_unpack() {
 	# compat version
 	# http://blog.qt.digia.com/blog/2010/06/22/qt-assistant-compat-version-available-as-extra-source-package/
 	if use compat; then
-		mv "${WORKDIR}"/qt-assistant-qassistantclient-library-compat-version-4.6.3 \
-			"${S}"/tools/assistant/compat || die
+		mv "${WORKDIR}"/qt-assistant-qassistantclient-library-compat-version-4.6.3 "${S}"/tools/assistant/compat || die
+		mv "${WORKDIR}"/QtAssistant "${S}"/include || die
 	fi
 }
 
@@ -78,7 +78,7 @@ multilib_src_configure() {
 
 	if use compat; then
 		# syncqt knows nothing about these headers (bug 529398)
-		cp -pr "${WORKDIR}"/QtAssistant "${BUILD_DIR}"/include || die
+		cp -pr "${S}"/include/QtAssistant "${BUILD_DIR}"/include || die
 	fi
 }