diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/scripts/man-qtdoc.1.docbook | 4 | ||||
| -rw-r--r-- | doc/scripts/tdesvn-build/index.docbook | 22 |
2 files changed, 13 insertions, 13 deletions
diff --git a/doc/scripts/man-qtdoc.1.docbook b/doc/scripts/man-qtdoc.1.docbook index 7491089e..4924eb84 100644 --- a/doc/scripts/man-qtdoc.1.docbook +++ b/doc/scripts/man-qtdoc.1.docbook @@ -44,8 +44,8 @@ page for that class. Otherwise the main &Qt; help page is opened. <variablelist> <varlistentry> -<term><envar>QTDIR</envar></term> -<listitem><para>The directory beneath which &Qt; is installed. The main &Qt; help page is expected to be in <filename class="directory">$<envar>QTDIR</envar>/doc/html/</filename>.</para></listitem> +<term><envar>TQTDIR</envar></term> +<listitem><para>The directory beneath which &Qt; is installed. The main &Qt; help page is expected to be in <filename class="directory">$<envar>TQTDIR</envar>/doc/html/</filename>.</para></listitem> </varlistentry> </variablelist> diff --git a/doc/scripts/tdesvn-build/index.docbook b/doc/scripts/tdesvn-build/index.docbook index d9c58333..68c46659 100644 --- a/doc/scripts/tdesvn-build/index.docbook +++ b/doc/scripts/tdesvn-build/index.docbook @@ -256,7 +256,7 @@ and add to the end of the file: <programlisting> TDEDIR=(path to tdedir) TDEDIRS=$TDEDIR -PATH=$TDEDIR/bin:$QTDIR/bin:$PATH +PATH=$TDEDIR/bin:$TQTDIR/bin:$PATH LD_LIBRARY_PATH=$TDEDIR/lib:$LD_LIBRARY_PATH export TDEDIRS PATH LD_LIBRARY_PATH </programlisting> @@ -264,13 +264,13 @@ export TDEDIRS PATH LD_LIBRARY_PATH If you are building the qt-copy module, add instead: <programlisting> -QTDIR=(path to qtdir) +TQTDIR=(path to qtdir) TDEDIR=(path to tdedir) TDEDIRS=$TDEDIR -PATH=$TDEDIR/bin:$QTDIR/bin:$PATH -MANPATH=$QTDIR/doc/man:$MANPATH -LD_LIBRARY_PATH=$TDEDIR/lib:$QTDIR/lib:$LD_LIBRARY_PATH -export QTDIR TDEDIRS PATH MANPATH LD_LIBRARY_PATH +PATH=$TDEDIR/bin:$TQTDIR/bin:$PATH +MANPATH=$TQTDIR/doc/man:$MANPATH +LD_LIBRARY_PATH=$TDEDIR/lib:$TQTDIR/lib:$LD_LIBRARY_PATH +export TQTDIR TDEDIRS PATH MANPATH LD_LIBRARY_PATH </programlisting> </para> @@ -420,7 +420,7 @@ source tree, you can force a rebuild of a module by creating a file called <listitem><para> You can specify various environment values to be used during the build, -including <envar>TDEDIR</envar>, <envar>QTDIR</envar>, <envar>DO_NOT_COMPILE</envar>, +including <envar>TDEDIR</envar>, <envar>TQTDIR</envar>, <envar>DO_NOT_COMPILE</envar>, and <envar>CXXFLAGS</envar>. </para></listitem> @@ -624,7 +624,7 @@ You can't override this setting in a module option. The default value is <filename class="directory">/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin</filename>. This environment variable should include the colon-separated paths of your development toolchain. The paths <filename class="directory">$TDEDIR/bin</filename> and -<filename class="directory">$QTDIR/bin</filename> are automatically added. You +<filename class="directory">$TQTDIR/bin</filename> are automatically added. You may use the tilde (~) for any paths you add using this option.</para> </entry> </row> @@ -829,7 +829,7 @@ linkend="conf-make-install-prefix">make-install-prefix</link> option as well.</e <entry>Set this option to set the environment variable LD_LIBRARY_PATH while building. You can't override this setting in a module option. The default value is blank, but the paths <filename class="directory">$TDEDIR/lib</filename> and -<filename class="directory">$QTDIR/lib</filename> are automatically +<filename class="directory">$TQTDIR/lib</filename> are automatically added. You may use the tilde (~) for any paths you add using this option. </entry> </row> @@ -930,7 +930,7 @@ can't figure out what you mean using <link linkend="conf-branch">branch</link>. <row id="conf-qtdir"> <entry>qtdir</entry> <entry>Can't be overridden</entry> -<entry>Set this option to set the environment variable QTDIR while building. +<entry>Set this option to set the environment variable TQTDIR while building. You can't override this setting in a module option. If you don't specify this option, it defaults to <filename class="directory"><varname>$(source-dir)</varname>/build/qt-copy</filename>, @@ -1024,7 +1024,7 @@ instead, which works from the release tarballs.</para> qt-copy. Set this option to <quote>true</quote> to enable the script's <emphasis>experimental</emphasis> srcdir != builddir mode. When enabled, &tdesvn-build; will copy the qt-copy source module to the build directory, -and perform builds from there. That means your QTDIR environment variable +and perform builds from there. That means your TQTDIR environment variable should be set to <filename class="directory">$(qt-copy-build-dir)/qt-copy/lib</filename> instead. You should also change your <link linkend="conf-qtdir">qtdir</link> |