[yorick-ygsl] 07/10: Merge branch 'master' of github.com:emmt/ygsl

[Thibaut Jean-Claude Paumard]

This is an automated email from the git hooks/post-receive script.

thibaut pushed a commit to branch upstream
in repository yorick-ygsl.

commit 9d9a28a94a020357b9e045c1d59095d499384ac4
Merge: 324fe70 ce77104
Author: Éric Thiébaut <eric.thiebaut at univ-lyon1.fr>
Date:   Fri Mar 18 09:03:38 2016 +0100

    Merge branch 'master' of github.com:emmt/ygsl
    
    Conflicts:
    	README.md

 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc README.md
index 74237e6,e425ae6..03bddbe
--- a/README.md
+++ b/README.md
@@@ -37,43 -30,43 +37,43 @@@ More detailled installation explanation
  1. You must have Yorick and the GSL (GNU Scientific Library) installed
     on your machine.  (See the *"Links"* section below.)
  
- 2. Unpack the plug-in code somewhere.
+ 2. Unpack the software code somewhere or clone the Git repository.
  
 -3. Configure for compilation.  The are two possibilities:
 +3. Configure for compilation.  There are two possibilities:
  
 -   For an **in-place build**, go to the source directory of the software
 -   code and run the configuration script:
 -   ````
 -   $ cd $SRC_DIR
 -   $ ./configure
 +   For an **in-place build**, go to the source directory, say `$SRC_DIR`, of
 +   the plug-in code and run the configuration script:
 +   ````{.sh}
 +   cd $SRC_DIR
 +   ./configure
     ````
     To see the configuration options, call:
 +   ````{.sh}
 +   ./configure --help
     ````
 -   $ ./configure --help
 -   ````
 -   
 +
     To compile in a **different build directory**, say `$BUILD_DIR`, create the
 -   build directory, go to the build directory, and run the configuration
 -   script from there:
 +   build directory, go to the build directory and run the configuration
 +   script:
 +   ````{.sh}
 +   mkdir -p $BUILD_DIR
 +   cd $BUILD_DIR
 +   $SRC_DIR/configure
     ````
 -   $ mkdir -p $BUILD_DIR
 -   $ cd $BUILD_DIR
 -   $ $SRC_DIR/configure
 -   ````
 -   where `$SRC_DIR` is the path to the source directory of the software
 -   code. To see the configuration options, call:
 -   ````
 -   $ $SRC_DIR/configure --help
 +   where `$SRC_DIR` is the path to the source directory of the plug-in code.
 +   To see the configuration options, call:
 +   ````{.sh}
 +   $SRC_DIR/configure --help
     ````
  
 -4. Compile the software:
 -   ````
 -   $ make
 +4. Compile the code:
 +   ````{.sh}
 +   make
     ````
  
 -5. Install the software in Yorick directories:
 -   ````
 -   $ make install
 +4. Install the plug-in in Yorick directories:
 +   ````{.sh}
 +   make install
     ````
  
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/yorick-ygsl.git