Skip to content

Commit 87fe104

Browse files
hebastofanquake
andcommitted
depends: Use more legible qmake commands in qt package
This change gets rid of multiple `../` that makes reasoning about the script and its maintaining much easier. Co-authored-by: fanquake <[email protected]>
1 parent bf35a8d commit 87fe104

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

depends/packages/qt.mk

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -260,11 +260,12 @@ define $(package)_config_cmds
260260
./configure $($(package)_config_opts) && \
261261
echo "host_build: QT_CONFIG ~= s/system-zlib/zlib" >> mkspecs/qconfig.pri && \
262262
echo "CONFIG += force_bootstrap" >> mkspecs/qconfig.pri && \
263-
$(MAKE) sub-src-clean && \
264-
cd ../qttranslations && ../qtbase/bin/qmake qttranslations.pro -o Makefile && \
265-
cd translations && ../../qtbase/bin/qmake translations.pro -o Makefile && cd ../.. && \
266-
cd qttools/src/linguist/lrelease/ && ../../../../qtbase/bin/qmake lrelease.pro -o Makefile && \
267-
cd ../lupdate/ && ../../../../qtbase/bin/qmake lupdate.pro -o Makefile && cd ../../../..
263+
cd .. && \
264+
$(MAKE) -C qtbase sub-src-clean && \
265+
qtbase/bin/qmake -o qttranslations/Makefile qttranslations/qttranslations.pro && \
266+
qtbase/bin/qmake -o qttranslations/translations/Makefile qttranslations/translations/translations.pro && \
267+
qtbase/bin/qmake -o qttools/src/linguist/lrelease/Makefile qttools/src/linguist/lrelease/lrelease.pro && \
268+
qtbase/bin/qmake -o qttools/src/linguist/lupdate/Makefile qttools/src/linguist/lupdate/lupdate.pro
268269
endef
269270

270271
define $(package)_build_cmds

0 commit comments

Comments
 (0)