X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=INSTALL;h=ad3acf1175a59d885e0630306b78e26d6b57cab8;hb=39caa7010008bbb32418d39d068f2fab65dbb748;hp=152561818115ccec10f30f9128e4ea53d6fbd7e3;hpb=3abbc3a2776c88f7f60a6462f8ed494bf9e6024c;p=lyx.git

diff --git a/INSTALL b/INSTALL
index 1525618181..ad3acf1175 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,5 +1,10 @@
-Compiling and installing LyX
-============================
+Compiling and installing LyX with autotools
+===========================================
+
+This document is about compiling LyX with the autotools suite. If you
+want to compile using using CMake (in particular on windows), please
+refer to the INSTALL.cmake file.
+
 
 Quick compilation guide
 -----------------------
@@ -48,7 +53,7 @@ Requirements
 ------------
 
 First of all, you will need a C++11 standard conforming compiler, like gcc (at
-least 4.7) or clang.
+least 4.8) or clang.
 
 LyX makes great use of the C++ Standard Template Library (STL).
 This means that gcc users will have to install the relevant libstdc++
@@ -64,6 +69,9 @@ To build LyX with spell checking capabilities included you have to
 install at least one of the development packages of the spell checker
 libraries. See the RELEASE-NOTES for details.
 
+Users of debian-based distributions are well advised to run
+'apt-get build-dep lyx' before compiling to install proper dependencies.
+
 
 * Other things to note
 
@@ -106,20 +114,21 @@ flags:
     stdlib-debug                                 X
     warnings                         X           X
     debug                            X           X           X       X
+    maintainer-mode                              X
 
     The defaults are as follows in terms of version number
     release: stable release (2.x.y)
-    prerelease: version number contains alpha, beta, rc or pre.
-    development: version number contains dev.
+    prerelease: version number contains `alpha', `beta', `rc' or `pre'.
+    development: version number contains `dev'.
 
     The `profiling' build type uses the -fno-omit-frame-pointer option with gcc
 
     The `gprof' build type compiles and links with -pg option with gcc.
 
-o --disable-qt5 that forces configuration with Qt 4.x when Qt 5.x is
+  o --disable-qt5 that forces configuration with Qt 4.x when Qt 5.x is
     also available. By default Qt5 is tried first, and then Qt4.
 
-o --with-extra-lib=DIRECTORY that specifies the path where LyX will
+  o --with-extra-lib=DIRECTORY that specifies the path where LyX will
     find extra libraries (like Qt) it needs. Defaults to NONE
     (i.e. search in standard places). You can specify several
     directories, separated by colons.