diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -91,8 +91,8 @@ QMAKE_VARS="$QMAKE_VARS \"kbd-drivers += tty\" \"mouse-drivers += pc\"" # initalize variables #------------------------------------------------------------------------------- -# QTDIR may be set and point to an old or system-wide TQt installation -unset QTDIR +# TQTDIR may be set and point to an old or system-wide TQt installation +unset TQTDIR # initalize internal variables CFG_CONFIGURE_EXIT_ON_ERROR=yes @@ -2262,8 +2262,8 @@ esac # symlink includes if [ -x "$relpath/bin/syncqt" ]; then - QTDIR=$relpath perl $relpath/bin/syncqt -inc $relpath/include - [ "$OPT_SHADOW" = "yes" ] && QTDIR=$relpath perl $relpath/bin/syncqt -inc $outpath/include + TQTDIR=$relpath perl $relpath/bin/syncqt -inc $relpath/include + [ "$OPT_SHADOW" = "yes" ] && TQTDIR=$relpath perl $relpath/bin/syncqt -inc $outpath/include fi if [ "$OPT_SHADOW" = "yes" ]; then @@ -2578,8 +2578,8 @@ if [ "$PLATFORM_QWS" = "yes" -o "$PLATFORM_QNX" = "yes" ]; then QMAKE_CONFIG="$QMAKE_CONFIG embedded" rm -f src/.moc/$QMAKE_OUTDIR/allmoc.cpp # needs remaking if config changes fi -QMAKE_VARS="$QMAKE_VARS \"QMAKE_INCDIR_QT=$relpath/include\"" -QMAKE_VARS="$QMAKE_VARS \"QMAKE_LIBDIR_QT=$outpath/lib\"" +QMAKE_VARS="$QMAKE_VARS \"QMAKE_INCDIR_TQT=$relpath/include\"" +QMAKE_VARS="$QMAKE_VARS \"QMAKE_LIBDIR_TQT=$outpath/lib\"" QMAKE_VARS="$QMAKE_VARS \"QMAKE_RTLDIR_QT=$QT_INSTALL_LIBS\"" QMAKE_VARS="$QMAKE_VARS \"OBJECTS_DIR=.obj/$QMAKE_OUTDIR\" \"MOC_DIR=.moc/$QMAKE_OUTDIR\"" if [ "$CFG_LARGEFILE" = "yes" ]; then |