comparison kdiff3/README @ 66:efe33e938730

0.9.86

 KDiff3-Readme
 =============
 
 Author: Joachim Eibl  ([e-mail])
-Copyright: (C) 2002-2003 by Joachim Eibl
-KDiff3-Version: 0.9.83
+Copyright: (C) 2002-2004 by Joachim Eibl
+KDiff3-Version: 0.9.86
 
 
 KDiff3 is a program that
 - compares and merges two or three input files or directories,
 - shows the differences line by line and character by character (!),

     executable, without including the source code for the Qt-library in the
     source distribution.
 
 
 Requirements & Installation:
-   Version 0.9.83 provides special support for KDE3, but it can also be
+   Version 0.9.86 provides special support for KDE3, but it can also be
    built without KDE3 if the Qt-libraries are available.
-   (I also tested the program under Windows.)
+   (I also test and use the program under Windows.)
 
    You always need
-      - kdiff3-0.9.83.tar.gz
+      - kdiff3-0.9.86.tar.gz
 
    For building the KDE3-version
-      - KDE>=3.1 and QT>=3.1-libraries.
+      - KDE>=3.1 and QT>=3.1-libraries. (QT>=3.2 is recommended)
       - gcc, g++ with version >=3.2
 
    For building the Qt-only-version
       - QT-libraries (version >=3.1.0).
         (www.trolltech.com)
       - for Un*x:    gcc, g++ with version >=3.2
-      - for Windows: VC6
+      - for Windows: VC6 / VC7.1
 
 
 Installation for KDE3:
    - Make sure your shell-variable QTDIR is correct. (echo $QTDIR).
      If it doesn't contain the correct path, type
         export QTDIR=your_path_to_qt  (e.g. /usr/lib/qt3)
-   - cd into the directory kdiff3-0.9.83 and type
+   - cd into the directory kdiff3-0.9.86 and type
    - ./configure --prefix=/opt/kde3           (your KDE3 directory here)
    - (make clean)                    (Required if you already compiled once.)
    - make                            (Run compilation)
    - make install                    (You must have root-rights for this step.)
 

    use that directory with the prefix-option of configure.
 
    This command should tell you: kde-config --prefix
 
    For SuSE and most distributions the prefix usually is /opt/kde3.
-   For Redhat and Mandrake the prefix usually is /usr.
+   For Redhat/Fedora and Mandrake the prefix usually is /usr.
    For a local installation, that doesn't need root rights try
    - ./configure --prefix=$KDEHOME  ($KDEHOME probably is the same as $HOME/.kde)
    - make
    - make install    (Installs everything in $KDEHOME. No root rights required.)
    - Run $KDEHOME/bin/kdiff3. ($KDEHOME/bin is probably not in your path.)

 Installation for the Qt-only-platforms for Un*x:
    (for Qt >=3.1.0)
    - Make sure your shell-variable QTDIR is correct. (echo $QTDIR).
      If it doesn't contain the correct path, type
         export QTDIR=your_path_to_qt  (e.g. /usr/lib/qt)
-   - cd into the directory kdiff3-0.9.83/src and type
+   - cd into the directory kdiff3-0.9.86/src and type
    - make -f Makefile.qt
    - make -f Makefile.qt install     (You must have root-rights for this step.)
      (copies the files into /usr/local/bin and /usr/local/share/doc/kdiff3)
    - Note: The file kdiff3.pro was used to generate the Makefile.qt:
            qmake kdiff3.pro -o Makefile.qt
-
-
+   If you want to build the Qt-only version _and_ the KDE-version, do this
+   in separate directories, otherwise there will be errors. 
 
 Build for Windows:
  Use qmake and kdiff3.pro to generate
  an appropriate Makefile.
      qmake kdiff3.pro -o Makefile