[vlc-commits] Contribs: use standard installations for Qt

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Fri Mar 18 00:49:36 2016 +0100| [f3d8176e8d13c78e58c746da24b26ccd1226768a] | committer: Jean-Baptiste Kempf

Contribs: use standard installations for Qt

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f3d8176e8d13c78e58c746da24b26ccd1226768a
---

 contrib/src/qt/rules.mak |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/src/qt/rules.mak b/contrib/src/qt/rules.mak
index 6ee4e5a..2da2cfb 100644
--- a/contrib/src/qt/rules.mak
+++ b/contrib/src/qt/rules.mak
@@ -48,8 +48,8 @@ QT_CONFIG := -static -release -opensource -confirm-license -no-pkg-config \
 	cd $</src/plugins && $(MAKE) sub-platforms-install_subtargets
 	mv $(PREFIX)/plugins/platforms/libqwindows.a $(PREFIX)/lib/ && rm -rf $(PREFIX)/plugins
 	# Move includes to match what VLC expects
-	rm -rf $(PREFIX)/include/qt5/ && mkdir $(PREFIX)/include/qt5/ && mv -v $(PREFIX)/include/Q* $(PREFIX)/include/qt5/
-	mkdir $(PREFIX)/include/qt5/QtGui/qpa && cp $(PREFIX)/include/qt5/QtGui/$(QT_VERSION)/QtGui/qpa/qplatformnativeinterface.h $(PREFIX)/include/qt5/QtGui/qpa
+	mkdir -p $(PREFIX)/include/QtGui/qpa
+	cp $(PREFIX)/include/QtGui/$(QT_VERSION)/QtGui/qpa/qplatformnativeinterface.h $(PREFIX)/include/QtGui/qpa
 	# Clean Qt mess
 	rm -rf $(PREFIX)/lib/libQt5Bootstrap* $(PREFIX)/lib/*.prl $(PREFIX)/mkspecs
 ifdef HAVE_CROSS_COMPILE