[mlpack-git] master: Merge branch 'master' of https://github.com/jaskaran1/mlpack into jaskaran1-master (5b313de)

[gitdub at big.cc.gt.atl.ga.us]

Repository : https://github.com/mlpack/mlpack

On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/904762495c039e345beba14c1142fd719b3bd50e...f94823c800ad6f7266995c700b1b630d5ffdcf40

>---------------------------------------------------------------

commit 5b313de0e48ed7db63ea29e9f4ae62d037662c96
Merge: a6e5686 59c7595
Author: Ryan Curtin <ryan at ratml.org>
Date:   Tue Feb 3 09:50:10 2015 -0500

    Merge branch 'master' of https://github.com/jaskaran1/mlpack into jaskaran1-master
    
    Conflicts:
    	README.md


>---------------------------------------------------------------

5b313de0e48ed7db63ea29e9f4ae62d037662c96
 README.md | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --cc README.md
index 46beb41,3481d1b..79b2436
--- a/README.md
+++ b/README.md
@@@ -132,32 -132,30 +132,31 @@@ and submit an issue; the mlpack develop
  
  Alternately, mlpack help can be found in IRC at #mlpack on irc.freenode.net.
  
--If you wish to install mlpack to /usr/include/mlpack/ and /usr/lib/ and
--/usr/bin/, once it has built, make sure you have root privileges (or write
--permissions to those two directories), and simply type
++If you wish to install mlpack to /usr/local/include/mlpack/ and /usr/local/lib/
++and /usr/local/bin/, once it has built, make sure you have root privileges (or
++write permissions to those three directories), and simply type
  
      $ make install
  
  You can now run the executables by name; you can link against mlpack with
      -lmlpack
  and the mlpack headers are found in
-     /usr/include/mlpack/.
+     /usr/local/include/mlpack/.
  
 +If running the programs (i.e. `$ allknn -h`) gives an error of the form
 +
 +    error while loading shared libraries: libmlpack.so.1: cannot open shared object file: No such file or directory
 +
 +then be sure that the runtime linker is searching the directory where
 +`libmlpack.so` was installed (probably `/usr/local/lib/` unless you set it
 +manually).  One way to do this, on Linux, is to ensure that the
 +`LD_LIBRARY_PATH` environment variable has the directory that contains
 +`libmlpack.so`.  Using bash, this can be set easily:
 +
 +    export LD_LIBRARY_PATH=/usr/local/lib/
 +
 +(or whatever directory `libmlpack.so` is installed in.)
  
- 
  5. Running mlpack programs
  --------------------------