summaryrefslogtreecommitdiffstats
path: root/README
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2018-09-27 16:04:15 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2018-09-27 16:04:15 +0900
commitbcbc4cad354c554b4c240a50a0828c2f54819245 (patch)
tree5880d55f25ced8addec297ea2af17265f61e260e /README
parente5650b540c7a5f17a0147aed0d8ad71bdffca41f (diff)
downloadkdiff3-bcbc4cad354c554b4c240a50a0828c2f54819245.tar.gz
kdiff3-bcbc4cad354c554b4c240a50a0828c2f54819245.zip
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 <michele.calgaro@yahoo.it>
Diffstat (limited to 'README')
-rw-r--r--README14
1 files changed, 7 insertions, 7 deletions
diff --git a/README b/README
index e6ddc8c..9ece7b7 100644
--- a/README
+++ b/README
@@ -71,9 +71,9 @@ Requirements & Installation:
- tdelibs-devel
Installation for KDE3:
- - Make sure your shell-variable QTDIR is correct. (echo $QTDIR).
+ - Make sure your shell-variable TQTDIR is correct. (echo $TQTDIR).
If it doesn't contain the correct path, type
- export QTDIR=your_path_to_qt (e.g. /usr/lib/qt3)
+ export TQTDIR=your_path_to_qt (e.g. /usr/lib/qt3)
- cd into the directory kdiff3-0.9.91 and type
- ./configure --prefix=/opt/trinity (your KDE3 directory here)
- (make clean) (Required if you already compiled once.)
@@ -137,9 +137,9 @@ Building an RPM for Fedora Core (by Vadim Likhota)
Installation for the Qt-only-platforms for Un*x:
(for Qt >=3.3.0 but <4.0)
- - Make sure your shell-variable QTDIR is correct. (echo $QTDIR).
+ - Make sure your shell-variable TQTDIR is correct. (echo $TQTDIR).
If it doesn't contain the correct path, type
- export QTDIR=your_path_to_qt (e.g. /usr/lib/qt)
+ export TQTDIR=your_path_to_qt (e.g. /usr/lib/qt)
- cd into the directory kdiff3-0.9.91/src and type
- make -f Makefile.qt
- make -f Makefile.qt install (You must have root-rights for this step.)
@@ -149,7 +149,7 @@ Installation for the Qt-only-platforms for Un*x:
If you want to build the Qt-only version _and_ the KDE-version, do this
in separate directories, otherwise there will be errors.
- A user reported that on his 64-bit machine running FC4 he had to edit his Makefile.qt
- LIBS = $(SUBLIBS) -L/usr/lib64/ -L$(QTDIR)/lib64/ -L/usr/lib -L$(QTDIR)/lib/ -L/usr/X11R6/lib/ -L/usr/X11R6/lib64/ -lqt-mt -lXext -lX11 -lm -lpthread
+ LIBS = $(SUBLIBS) -L/usr/lib64/ -L$(TQTDIR)/lib64/ -L/usr/lib -L$(TQTDIR)/lib/ -L/usr/X11R6/lib/ -L/usr/X11R6/lib64/ -lqt-mt -lXext -lX11 -lm -lpthread
Build for Windows:
@@ -226,7 +226,7 @@ Note for KDE-users:
normal version 0.9.91.
Build-instructions (Unix or Mac):
- - Make sure your shell-variable QTDIR is correct and that
+ - Make sure your shell-variable TQTDIR is correct and that
your path contains the Qt4-bin-directory.
- cd into the directory kdiff3-0.9.91/src-QT4 and type
- qmake kdiff3.pro
@@ -234,7 +234,7 @@ Build-instructions (Unix or Mac):
Build-instructions (Windows):
- Run your qtvars.bat in the Qt4-bin directory.
- (This should set your QTDIR, QMAKESPEC and PATH-environment-variables.)
+ (This should set your TQTDIR, QMAKESPEC and PATH-environment-variables.)
- cd into the directory kdiff3-0.9.91/src-Qt4 and type
- qmake kdiff3.pro
- make (which calls either "mingw32-make" or "nmake")