Update installation instructions.

diff --git a/src/INSTALL b/src/INSTALL
index 3f7a01928ba00bb66b7ad3c86a677aeaceb5b4bd..8decefe71c2b90f8c123731e1e22e86b09ce4eba 100644 (file)
--- a/src/INSTALL
+++ b/src/INSTALL
@@ -6,14 +6,25 @@ compilation, see ../windows/INSTALL.
 You must first have completed the installation steps in ../tools/INSTALL
 (compiling OpenFst; getting ATLAS and CLAPACK headers).
 
-The installation instructions are:
-./configure --shared
-make depend
-make
-
-Note that "make" takes a long time; you can speed it up by running make
-in parallel if you have multiple CPUs, for instance
- make depend -j 8
- make -j 8
+The installation instructions are
+
+  ./configure --shared
+  make depend
+  make
+
+Note that "make" takes a long time. You can speed it up by running make
+in parallel if you have multiple CPUs, e.g. to use 8 CPUs
+
+  make depend -j 8
+  make -j 8
+
+Kaldi requires a relatively recent C++ compiler with C++11 support,
+e.g. g++ >= 4.7, Apple clang >= 5.0 or LLVM clang >= 3.3. If your system
+default compiler does not support C++11, you can specify a C++11 compliant
+compiler by setting the CXX environment variable, e.g.
+
+  make depend CXX=g++-4.8
+  make CXX=g++-4.8
+
 For more information, see documentation at http://kaldi-asr.org/doc/
 and click on "The build process (how Kaldi is compiled)".

diff --git a/tools/INSTALL b/tools/INSTALL
index 0678e2c88154b6168f4fd3f3514c334388f3bebc..7e5549294c8d4cc860a7bae175af4b0af196f412 100644 (file)
--- a/tools/INSTALL
+++ b/tools/INSTALL
@@ -14,12 +14,16 @@ Then run
   make
 
 If you have multiple CPUs and want to speed things up, you can do a parallel
-build by supplying the "-j" option to make, e.g. to use 4 CPUs:
+build by supplying the "-j" option to make, e.g. to use 4 CPUs
 
   make -j 4
 
-Kaldi builds against OpenFst >= 1.5.3 which requires a relatively new compiler
-with C++11 support, e.g. gcc >= 4.6, clang >= 3.0.
+OpenFst requires a relatively recent C++ compiler with C++11 support,
+e.g. g++ >= 4.7, Apple clang >= 5.0 or LLVM clang >= 3.3. If your system
+default compiler does not support C++11, you can specify a C++11 compliant
+compiler by setting the CXX environment variable, e.g.
+
+  make CXX=g++-4.8
 
 In extras/, there are also various scripts to install extra bits and pieces that
 are used by individual example scripts.  If an example script needs you to run

diff --git a/tools/Makefile b/tools/Makefile
index eb62da22c4ea1f9820df29928714211f68596b4a..f6fe7a45db870452d9964d0aaec3e8bbdedbf9d0 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -5,9 +5,9 @@ CC = gcc         # used for sph2pipe
 # CXX = clang++  # Uncomment these lines
 # CC = clang     # to build with Clang.
 
-# Note: OpenFst >= 1.5.3 and Kaldi require a relatively recent C++ compiler
-# with C++11 support, e.g. g++ >= 4.7, Apple clang >= 5.0 or LLVM clang >= 3.3.
-OPENFST_VERSION = 1.5.4
+# Note: OpenFst requires a relatively recent C++ compiler with C++11 support,
+# e.g. g++ >= 4.7, Apple clang >= 5.0 or LLVM clang >= 3.3.
+OPENFST_VERSION = 1.5.4  # Supported versions: >= 1.5.3
 
 OPENFST_VER_NUM := $(shell echo $(OPENFST_VERSION) | sed 's/\./ /g' | xargs printf "%d%02d%02d")
 ifeq ("$(shell expr $(OPENFST_VER_NUM) \< 10503)","1")