X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;ds=sidebyside;f=README.md;h=0c0cfd4e31372460e71d494388da84c9d34c6b23;hb=88cd8ffad493971ae4704ed007d8430c1d3fd7eb;hp=06247b405a2464afdb45a467468dffe514d4206c;hpb=f28d977659db23f54b7a5badf6ef40b118e82ad9;p=anna.git

diff --git a/README.md b/README.md
index 06247b4..0c0cfd4 100644
--- a/README.md
+++ b/README.md
@@ -34,9 +34,11 @@ You could specify type of build, 'Debug' or 'Release', for example:
 
      > make clean
 
-## Change the compiler to Clang++
+## Change the compilers
 
-     > cmake -DCMAKE_CXX_COMPILER=/usr/bin/clang++ 
+     > cmake -DCMAKE_CXX_COMPILER=/usr/bin/g++     -DCMAKE_C_COMPILER=/usr/bin/gcc
+     or
+     > cmake -DCMAKE_CXX_COMPILER=/usr/bin/clang++ -DCMAKE_C_COMPILER=/usr/bin/clang
 
 ## Some basic ubuntu requirements
 
@@ -57,20 +59,11 @@ You could specify type of build, 'Debug' or 'Release', for example:
 
 ### Oracle:
      https://help.ubuntu.com/community/Oracle%20Instant%20Client
-     Set 'ORACLE_HOME' environment variable in your profile, i.e.:
-        export ORACLE_HOME=/usr/lib/oracle/12.1/client64/
 
-     Be sure to create in that directory, a link to oracle includes,
-     for example:
+     After instalation of basic/sqlplus/devel, edit CMakeLists.txt
+     and update oracle includes, for example:
 
-	> /usr/lib/oracle/12.1/client64$ ls -lrt
-	total 8
-	drwxr-xr-x 2 root root 4096 Feb 28 15:59 bin
-	drwxr-xr-x 2 root root 4096 Feb 28 15:59 lib
-	lrwxrwxrwx 1 root root   33 Feb 28 16:07 include -> /usr/include/oracle/12.1/client64
-
-     The alternative is to edit SConstruct file directly to set
-     oracle includes directory.
+       include_directories(/usr/include/oracle/<version>/client64/include)
 
 ### Oracle-OpenLDAP conflict:
      as usual, Oracle is doing things very bad. Move the ldap.h from oracle includes, i.e.:
@@ -116,14 +109,14 @@ Execute 'make test'
 
 To install headers, libraries, and examples, execute:
 
-     > make install
+     > sudo make install
 
 Optionally you could specify another prefix for installation:
 
-     > cmake -DCMAKE_INSTALL_PREFIX=$HOME/anna_deploy .
+     > cmake -DMY_OWN_INSTALL_PREFIX=$HOME/anna-deploy
+     > make install
 
 ## Uninstall
 
      > cat install_manifest.txt | sudo xargs rm
 
-