[vlc-commits] contrib:qtdeclarative: fix qmake path usage

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Mon Oct  1 13:05:44 2018 +0200| [cf2c972cf3c0940c880f1def4ae630dce7460d11] | committer: Steve Lhomme

contrib:qtdeclarative: fix qmake path usage

The relative path doesn't work when not in the root

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

 contrib/src/qtdeclarative/rules.mak | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/contrib/src/qtdeclarative/rules.mak b/contrib/src/qtdeclarative/rules.mak
index eb674140de..b2a6d0a2e0 100644
--- a/contrib/src/qtdeclarative/rules.mak
+++ b/contrib/src/qtdeclarative/rules.mak
@@ -29,16 +29,15 @@ qtdeclarative: qtdeclarative-$(QTDECLARATIVE_VERSION).tar.xz .sum-qtdeclarative
 	mv qtdeclarative-everywhere-src-$(QTDECLARATIVE_VERSION) qtdeclarative-$(QTDECLARATIVE_VERSION)
 	$(MOVE)
 
+.qtdeclarative: qtdeclarative
+	# Generate Makefile & src/Makefile
 ifdef HAVE_CROSS_COMPILE
-QMAKE=$(PREFIX)/bin/qmake
+	cd $< && $(PREFIX)/bin/qmake
+	cd $</src && $(PREFIX)/bin/qmake -o Makefile src.pro
 else
-QMAKE=../qt/bin/qmake
+	cd $< && ../qt/bin/qmake
+	cd $</src && ../../qt/bin/qmake -o Makefile src.pro
 endif
-
-.qtdeclarative: qtdeclarative
-	# Generate Makefile & src/Makefile
-	cd $< && $(QMAKE)
-	cd $</src && $(QMAKE) -o Makefile src.pro
 	# Build & install only what we require
 	# Invoke the build rules one at a time as some rule dependencies seem to be broken
 	cd $< && $(MAKE) -C src sub-quick-make_first-ordered