[1.5] Sync with trunk.

This commit is contained in:
Mathieu Malaterre 2012-03-02 09:27:24 +00:00
parent 590ba6d460
commit 0c7b21c46f
1 changed files with 6 additions and 5 deletions

11
INSTALL
View File

@ -66,12 +66,13 @@ Type:
If you are root: If you are root:
make install make install
make clean
else: else if you have sudo power:
sudo make install sudo make install
make clean
else
DESTDIR=$HOME/local make install
To build the Doxygen documentation (Doxygen needs to be found on the system): To build the Doxygen documentation (Doxygen needs to be found on the system):
(A 'html' directory is generated in the 'doc' directory) (A 'html' directory is generated in the 'doc' directory)
make doc make doc
@ -79,7 +80,7 @@ To build the Doxygen documentation (Doxygen needs to be found on the system):
Binaries are located in the 'bin' directory. Binaries are located in the 'bin' directory.
Main available cmake flags: Main available cmake flags:
* To specify the install path: '-DCMAKE_INSTALL_PREFIX=/path' * To specify the install path: '-DCMAKE_INSTALL_PREFIX=/path', or use DESTDIR env variable (see above)
* To build the shared libraries and links the executables against it: '-DBUILD_SHARED_LIBS:bool=on' (default: 'ON') * To build the shared libraries and links the executables against it: '-DBUILD_SHARED_LIBS:bool=on' (default: 'ON')
Note: when using this option, static libraries are not built and executables are dynamically linked. Note: when using this option, static libraries are not built and executables are dynamically linked.
* To build the CODEC executables: '-DBUILD_CODEC:bool=on' (default: 'ON') * To build the CODEC executables: '-DBUILD_CODEC:bool=on' (default: 'ON')