From 864b3b9918bcce34e4fa8769fec19569720c1c50 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 14 Jun 2013 16:45:08 +0200 Subject: don't write unused QT_INSTALL_* to qmake Makefiles the installation has been moved to the qtbase top-level project a long time ago. Change-Id: I25f1658d1a6544da4bdaa5be6b19f9076c19b7f9 Reviewed-by: Thiago Macieira Reviewed-by: Joerg Bornemann --- configure | 6 ------ 1 file changed, 6 deletions(-) (limited to 'configure') diff --git a/configure b/configure index baf811ce00..6befb05ba1 100755 --- a/configure +++ b/configure @@ -4055,10 +4055,6 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; if [ '!' -z "$D_FLAGS" ]; then EXTRA_CFLAGS="$EXTRA_CFLAGS $D_FLAGS" fi - QMAKE_BIN_DIR="$QT_INSTALL_BINS" - [ -z "$QMAKE_BIN_DIR" ] && QMAKE_BIN_DIR="${QT_INSTALL_PREFIX}/bin" - QMAKE_DATA_DIR="$QT_INSTALL_ARCHDATA" - [ -z "$QMAKE_DATA_DIR" ] && QMAKE_DATA_DIR="${QT_INSTALL_PREFIX}" echo >>"$mkfile" adjrelpath=`echo "$relpath" | sed 's/ /\\\\\\\\ /g'` adjoutpath=`echo "$outpath" | sed 's/ /\\\\\\\\ /g'` @@ -4078,8 +4074,6 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ]; echo "QTOBJS = $EXTRA_OBJS" >> "$mkfile" echo "QTSRCS = $EXTRA_SRCS" >> "$mkfile" echo "LFLAGS = $EXTRA_LFLAGS" >> "$mkfile" - echo "QT_INSTALL_BINS = \$(INSTALL_ROOT)$QMAKE_BIN_DIR" >> "$mkfile" - echo "QT_INSTALL_DATA = \$(INSTALL_ROOT)$QMAKE_DATA_DIR" >> "$mkfile" echo "EXEEXT = $EXEEXT" >> "$mkfile" echo "RM_F = rm -f" >> "$mkfile" echo "RM_RF = rm -rf" >> "$mkfile" -- cgit v1.2.3