From 51f6fb56f143107fce78fb98b0328ded59bc4710 Mon Sep 17 00:00:00 2001 From: Dominik Riebeling Date: Sat, 2 Feb 2008 17:28:42 +0000 Subject: [PATCH] Don't overwrite the build pretarget libspeex with lrelease. Make sure to use the lrelease binary from the current installation to prevent clashes on systems with Qt3 and Qt4 installed in parallel. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16201 a1c6a512-1295-4272-9138-f99709370657 --- rbutil/rbutilqt/rbutilqt.pro | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro index d64edb1086..5676db810f 100644 --- a/rbutil/rbutilqt/rbutilqt.pro +++ b/rbutil/rbutilqt/rbutilqt.pro @@ -14,13 +14,13 @@ RCC_DIR = build/rcc # add a custom rule for pre-building librbspeex rbspeex.commands = @$(MAKE) -C ../../tools/rbspeex librbspeex.a -QMAKE_EXTRA_TARGETS = rbspeex -PRE_TARGETDEPS = rbspeex +QMAKE_EXTRA_TARGETS += rbspeex +PRE_TARGETDEPS += rbspeex # add a custom rule for makeing the translations -lrelease.commands = lrelease rbutilqt.pro +lrelease.commands = $$[QT_INSTALL_BINS]/lrelease -silent rbutilqt.pro QMAKE_EXTRA_TARGETS += lrelease -PRE_TARGETDEPS = lrelease +PRE_TARGETDEPS += lrelease SOURCES += rbutilqt.cpp \