From a615469e90c89c23000bd7c2f2905744123ac728 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 27 Sep 2018 16:03:56 +0900 Subject: qt -> tqt conversion: QTDIR -> TQTDIR QTDOC -> TQTDOC INCDIR_QT -> INCDIR_TQT LIBDIR_QT -> LIBDIR_TQT QT_INC -> TQT_INC QT_LIB -> TQT_LIB Signed-off-by: Michele Calgaro --- doc/scripts/man-qtdoc.1.docbook | 4 ++-- doc/scripts/tdesvn-build/index.docbook | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 13 deletions(-) (limited to 'doc') 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. -QTDIR -The directory beneath which &Qt; is installed. The main &Qt; help page is expected to be in $QTDIR/doc/html/. +TQTDIR +The directory beneath which &Qt; is installed. The main &Qt; help page is expected to be in $TQTDIR/doc/html/. 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: 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 @@ -264,13 +264,13 @@ export TDEDIRS PATH LD_LIBRARY_PATH If you are building the qt-copy module, add instead: -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 @@ -420,7 +420,7 @@ source tree, you can force a rebuild of a module by creating a file called You can specify various environment values to be used during the build, -including TDEDIR, QTDIR, DO_NOT_COMPILE, +including TDEDIR, TQTDIR, DO_NOT_COMPILE, and CXXFLAGS. @@ -624,7 +624,7 @@ You can't override this setting in a module option. The default value is /bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin. This environment variable should include the colon-separated paths of your development toolchain. The paths $TDEDIR/bin and -$QTDIR/bin are automatically added. You +$TQTDIR/bin are automatically added. You may use the tilde (~) for any paths you add using this option. @@ -829,7 +829,7 @@ linkend="conf-make-install-prefix">make-install-prefix option as well.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 $TDEDIR/lib and -$QTDIR/lib are automatically +$TQTDIR/lib are automatically added. You may use the tilde (~) for any paths you add using this option. @@ -930,7 +930,7 @@ can't figure out what you mean using branch. qtdir Can't be overridden -Set this option to set the environment variable QTDIR while building. +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 $(source-dir)/build/qt-copy, @@ -1024,7 +1024,7 @@ instead, which works from the release tarballs. qt-copy. Set this option to true to enable the script's experimental 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 $(qt-copy-build-dir)/qt-copy/lib instead. You should also change your qtdir -- cgit v1.2.1