installation.md

@@ -5,7 +5,7 @@ These instructions assume that your operating system is [Ubuntu](http://www.ubun
 This is most easily accomplished with the command: `sudo apt-get install root-system`
 
 ## 2. Install GEANT4
-Follow the [official installation instructions](http://geant4.web.cern.ch/geant4/support/gettingstarted.shtml).
+Follow the installation instructions from the [official GEANT4 website](http://geant4.web.cern.ch/geant4/support/gettingstarted.shtml).
 
 ## 3. Install VeikonKone
 
@@ -23,25 +23,18 @@ Follow the [official installation instructions](http://geant4.web.cern.ch/geant4
      https://git.kern.phys.au.dk/profile/keys
 
 4. In the parent directory to where you want AUSAlib  
-   `git clone git@git.kern.phys.au.dk:ausa/ausalib.git`
-5. cd into ausalib  
-   `cd ausalib`
+   `git clone git@git.kern.phys.au.dk:oliskir/VeikonKone.git`
+
+5. cd into the program directory
+   `cd VeikonKone`
+
 6. switch to latest stable edition  
-   `git checkout stable`
-7. Build a makefile for AUSAlib  
-   `cmake ./`
-8. Build AUSAlib.   
-   `make -j 4`  
-    You will now have a libAUSA.a
-9. You install AUSAlib two ways 
-    * __System wide install:__ If you want the headers copied to `/usr/local/include` and the library to `/usr/local/lib` i.e. where to compiler normally looks for this `sudo make install`  
-    * __Local install:__ Here you must define the two environment variables `AUSALIB_INC_DIR` the AUSAlib include directory and `AUSALIB_LIB_DIR` to the location of `libAUSA.a`. A convenient way to do this is to add the following lines to you `~/.bashrc` or `~/.profile`
-```
+   `git checkout master`
+
+7. Open the script `docmake.sh` using your preferred editor (e.g. gedit) and edit the line `cmake -DCMAKE_BUILD_TYPE=DEBUG -DGeant4_DIR=/home/oliskir/src/geant4/geant4.10.2-install/lib/Geant4-10.2.0 $pwd -DCMAKE_BUILD_TYPE=DEBUG` so the path is correct
+
+7. Build a makefile by running the script
+`./docmake.sh`
+
+8. Build VeikonKone   
+   `make -jN` (where `N` is the number of cores on your computer)  
\ No newline at end of file
-    export AUSALIB_INC_DIR=<path to ausalib>/ausalib/include
-    export AUSALIB_LIB_DIR=<path to ausalib>/ausalib/build
-```
-__OSX__: OSX users should add it to `~/.profile` and NOT to `~/.bashrc`
-10. Export the resource directory environment variable, `AUSALIB_RES_DIR`. This can also conveniently be added to `~/.bashrc` or `~/.profile`:
-    ```export AUSALIB_RES_DIR=<path to ausalib>/ausalib/res```
-
-**OBS: When you pull AUSAlib remember to cmake ./**
\ No newline at end of file