Fix lilypond support, patch from Julien Rioux, bug #6940.

[lyx.git] / INSTALL

diff --git a/INSTALL b/INSTALL
index b5e45530a13c23d126556327e5092e75bdadd1e9..3c981a4435ddbe4f72f55cffd481bdbee250083c 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -6,14 +6,17 @@ Quick compilation guide
 
 These four steps will compile, test and install LyX:
 
 
 These four steps will compile, test and install LyX:
 

-       0) Linux users beware: if compiling the Qt frontend, you need
-           qt4 and qt4-devel packages of the same version to compile LyX.
+       0) Linux users beware: You need qt4 and qt4-devel packages 
+          of the same version to compile LyX.

 
        1) ./configure
           configures LyX according to your system. 
 
        1) ./configure
           configures LyX according to your system. 

-          When compiling for Qt, you may have to set
-             --with-qt4-dir=<path-to-your-qt4-installation>
-           if the environment variable QTDIR is not set. 
+          You may have to set
+           --with-qt4-dir=<path-to-your-qt4-installation>
+     if the environment variable QTDIR is not set (for example,
+     '--with-qt4-dir=/usr/share/qt4/'). Alternatively, you could
+     install pkgconfig (the name might vary depending on your 
+     distribution). 

           See Note below if ./configure script is not present.
 
        2) make
           See Note below if ./configure script is not present.
 
        2) make


@@ -31,7 +34,7 @@ Note for Subversion (SVN) checkouts
 -----------------------------
 
 If you have checked this out from Subversion, you need to have:
 -----------------------------
 
 If you have checked this out from Subversion, you need to have:

-* automake >= 1.5
+* automake >= 1.8

 * autoconf >= 2.59c
 * gettext >= 0.12
 Then type "./autogen.sh" to build the needed configuration
 * autoconf >= 2.59c
 * gettext >= 0.12
 Then type "./autogen.sh" to build the needed configuration


@@ -39,6 +42,7 @@ files and proceed as stated below.
 
 You will also probably need GNU m4 (perhaps installed as gm4).
 
 
 You will also probably need GNU m4 (perhaps installed as gm4).
 

+

 Requirements
 ------------
 
 Requirements
 ------------
 


@@ -49,10 +53,10 @@ LyX 1.6.x makes great use of C++ Standard Template Library (STL).
 This means that gcc users will have to install the relevant libstdc++
 library to be able to compile this version of LyX. 
 
 This means that gcc users will have to install the relevant libstdc++
 library to be able to compile this version of LyX. 
 

-LyX has been tested with Qt 4.2/3/4.x. For compilation you need to compile
-against at least Qt 4.2.2. The only special point to make is that you must
-ensure that both LyX and the Qt libraries are compiled with the same C++
-compiler.
+LyX has been tested with all Qt versions since Qt 4.2.2. For compilation
+you need to compile against at least Qt 4.2.2. The only special point to
+make is that you must ensure that both LyX and the Qt libraries are
+compiled with the same C++ compiler.

 
 Note that if Qt is using Xft2/fontconfig, you may need to install the
 latex-xft-fonts package (at ftp://ftp.lyx.org/pub/lyx/contrib/) to get
 
 Note that if Qt is using Xft2/fontconfig, you may need to install the
 latex-xft-fonts package (at ftp://ftp.lyx.org/pub/lyx/contrib/) to get


@@ -249,10 +253,10 @@ The following options allow to tweak more precisely the generated code:
     want to use. The default value is qt4, which is the only available
     frontend for now.
 
     want to use. The default value is qt4, which is the only available
     frontend for now.
 

-  o --enable-monolithic-[boost,client,insets,mathed,core,tex2lyx,frontend-qt4]
-    that enable monolithic build of the given part of the source code. This
-    should reduce the compilation time provided you have enough memory
-    (>500MB).
+  o --enable-monolithic-build[=boost,client,insets,mathed,core,tex2lyx,frontend-qt4]
+    that enables monolithic build of the given parts of the source
+    code. This should reduce the compilation time provided you have
+    enough memory (>500MB).

 
 
 Compiling and installing LyX
 
 
 Compiling and installing LyX