diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-06-14 16:45:08 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-06-17 15:42:44 +0200 |
| commit | 864b3b9918bcce34e4fa8769fec19569720c1c50 (patch) | |
| tree | 45b463175ca595af0aad748c3c7a422d8889a41c | |
| parent | 70805d852a3dfc4b340316e428f11fd7c584c05d (diff) | |
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 <thiago.macieira@intel.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| -rwxr-xr-x | configure | 6 |
1 files changed, 0 insertions, 6 deletions
@@ -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" |