summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--acinclude.m410
-rw-r--r--doc/en/installation.docbook4
2 files changed, 7 insertions, 7 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index e0aa2ff..69a3250 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1296,7 +1296,7 @@ fi
dnl ------------------------------------------------------------------------
dnl Try to find the Qt headers and libraries.
dnl $(QT_LDFLAGS) will be -Lqtliblocation (if needed)
-dnl and $(QT_INCLUDES) will be -Iqthdrlocation (if needed)
+dnl and $(TQT_INCLUDES) will be -Iqthdrlocation (if needed)
dnl ------------------------------------------------------------------------
dnl
AC_DEFUN([AC_PATH_TQT_1_3],
@@ -1556,10 +1556,10 @@ AC_SUBST(qt_libraries)
AC_SUBST(qt_includes)
if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
- QT_INCLUDES=""
+ TQT_INCLUDES=""
else
- QT_INCLUDES="-I$qt_includes"
- all_includes="$QT_INCLUDES $all_includes"
+ TQT_INCLUDES="-I$qt_includes"
+ all_includes="$TQT_INCLUDES $all_includes"
fi
if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
@@ -1570,7 +1570,7 @@ else
fi
test -z "$KDE_MT_LDFLAGS" || all_libraries="$all_libraries $KDE_MT_LDFLAGS"
-AC_SUBST(QT_INCLUDES)
+AC_SUBST(TQT_INCLUDES)
AC_SUBST(QT_LDFLAGS)
AC_PATH_TQT_MOC_UIC
diff --git a/doc/en/installation.docbook b/doc/en/installation.docbook
index 02aa6d6..822c06f 100644
--- a/doc/en/installation.docbook
+++ b/doc/en/installation.docbook
@@ -1235,12 +1235,12 @@ make[1]: Leaving directory `/home/source/krusader_trinity'
<para>You can download the latest available krusader-2.x <link linkend="krusader_svn">from SVN</link>.</para>
-<para><command>DCMAKE_INSTALL_PREFIX</command> is the location of the KDE DQT_INCLUDES</para>
+<para><command>DCMAKE_INSTALL_PREFIX</command> is the location of the KDE DTQT_INCLUDES</para>
<para>
<screen>
<prompt>$</prompt> <userinput><command>tar -xzvf</command> <option>krusader_kde4.tar.gz</option></userinput>
<prompt>$</prompt> <userinput><command>cd </command> <option>krusader_kde4</option></userinput>
- <prompt>$</prompt> <userinput><command>cmake </command> <option>-DCMAKE_INSTALL_PREFIX=/usr/ -DQT_INCLUDES=/usr/share/qt4/include</option></userinput>
+ <prompt>$</prompt> <userinput><command>cmake </command> <option>-DCMAKE_INSTALL_PREFIX=/usr/ -DTQT_INCLUDES=/usr/share/qt4/include</option></userinput>
<prompt>$</prompt> <userinput><command>make</command></userinput>
<prompt>$</prompt> <userinput><command>su -c </command> <option>"make install"</option></userinput>
</screen>