From f83191bedd6f1eeb3985483273137c9589627a4d Mon Sep 17 00:00:00 2001
From: quemy <alexandre.quemy@gmail.com>
Date: Sat, 3 Nov 2012 18:44:19 +0100
Subject: [PATCH] Fix the bus in install location which is now determine by the
 OS

---
 CMakeLists.txt                                 | 2 +-
 cmake/Config.cmake                             | 2 ++
 cmake/Macro.cmake                              | 2 +-
 eo/CMakeLists.txt                              | 2 +-
 eo/doc/CMakeLists.txt                          | 2 +-
 eo/src/CMakeLists.txt                          | 6 +++---
 eo/src/es/CMakeLists.txt                       | 4 ++--
 eo/src/ga/CMakeLists.txt                       | 2 +-
 eo/src/pyeo/CMakeLists.txt                     | 2 +-
 eo/src/utils/CMakeLists.txt                    | 2 +-
 eo/test/CMakeLists.txt                         | 2 +-
 eo/tutorial/Lesson1/CMakeLists.txt             | 6 +++---
 eo/tutorial/Lesson2/CMakeLists.txt             | 6 +++---
 eo/tutorial/Lesson3/CMakeLists.txt             | 6 +++---
 eo/tutorial/Lesson4/CMakeLists.txt             | 6 +++---
 eo/tutorial/Lesson5/CMakeLists.txt             | 4 ++--
 eo/tutorial/Lesson6/CMakeLists.txt             | 4 ++--
 mo/doc/CMakeLists.txt                          | 2 +-
 mo/src/CMakeLists.txt                          | 4 ++--
 mo/test/CMakeLists.txt                         | 2 +-
 moeo/doc/CMakeLists.txt                        | 2 +-
 moeo/src/CMakeLists.txt                        | 6 +++---
 moeo/test/CMakeLists.txt                       | 2 +-
 moeo/tutorial/examples/flowshop/CMakeLists.txt | 6 +++---
 peo/doc/CMakeLists.txt                         | 2 +-
 peo/src/CMakeLists.txt                         | 4 ++--
 peo/src/core/CMakeLists.txt                    | 2 +-
 peo/src/rmc/mpi/CMakeLists.txt                 | 2 +-
 peo/test/CMakeLists.txt                        | 2 +-
 peo/tutorial/CMakeLists.txt                    | 2 +-
 smp/doc/CMakeLists.txt                         | 2 +-
 smp/src/CMakeLists.txt                         | 6 +++---
 smp/test/CMakeLists.txt                        | 4 ++--
 33 files changed, 56 insertions(+), 54 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bd39a7fbe..be2f2a516 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,7 +24,7 @@ endif()
 ## Versioning
 set(VERSION_MAJOR 2)
 set(VERSION_MINOR 0)
-set(VERSION_PATCH 0)
+set(VERSION_PATCH 1)
 
 ######################################################################################
 ### 2) Check dependencies
diff --git a/cmake/Config.cmake b/cmake/Config.cmake
index 9f390e24b..ac6553b54 100644
--- a/cmake/Config.cmake
+++ b/cmake/Config.cmake
@@ -91,3 +91,5 @@ if(UNIX)
     set(INSTALL_SUB_DIR /paradiseo)
 endif()
 
+
+
diff --git a/cmake/Macro.cmake b/cmake/Macro.cmake
index bfde799eb..b528e810a 100644
--- a/cmake/Macro.cmake
+++ b/cmake/Macro.cmake
@@ -30,7 +30,7 @@ macro(add_lesson module target files)
 	    elseif(${module} MATCHES smp)
 	        target_link_libraries(${i} smp eo eoutils)
 	    endif() 
-	    install(TARGETS ${i} RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/${module}/tutorial/${target} COMPONENT examples)   
+	    install(TARGETS ${i} RUNTIME DESTINATION ${INSTALL_BASE}/share${INSTALL_SUB_DIR}/${module}/tutorial/${target} COMPONENT examples)   
 	endforeach(i)
 	
 	# Custom target
diff --git a/eo/CMakeLists.txt b/eo/CMakeLists.txt
index 2f32bdb81..13af65ac5 100644
--- a/eo/CMakeLists.txt
+++ b/eo/CMakeLists.txt
@@ -134,7 +134,7 @@ SET(PCPREFIX "/usr")
 SET(PCFLAGS "-leoutils -leo -les -lga -lcma -lgcov")
 SET(PCINCLUDEDIR "eo")
 CONFIGURE_FILE(pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/eo.pc)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/eo.pc DESTINATION local/${LIB}/pkgconfig COMPONENT headers)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/eo.pc DESTINATION ${LIB}/pkgconfig COMPONENT headers)
 
 ######################################################################################
 
diff --git a/eo/doc/CMakeLists.txt b/eo/doc/CMakeLists.txt
index ac8c13ab2..d7aa864b0 100644
--- a/eo/doc/CMakeLists.txt
+++ b/eo/doc/CMakeLists.txt
@@ -39,7 +39,7 @@ IF (DOXYGEN_FOUND)
 
   INSTALL(
     DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-    DESTINATION local/share${INSTALL_SUB_DIR}/eo COMPONENT doc
+    DESTINATION share${INSTALL_SUB_DIR}/eo COMPONENT doc
     PATTERN "CMakeFiles" EXCLUDE
     PATTERN "cmake_install.cmake" EXCLUDE
     PATTERN "Makefile" EXCLUDE
diff --git a/eo/src/CMakeLists.txt b/eo/src/CMakeLists.txt
index 7042e065e..6e1bb3e40 100644
--- a/eo/src/CMakeLists.txt
+++ b/eo/src/CMakeLists.txt
@@ -21,13 +21,13 @@ SET(EO_SOURCES
   )
 
 ADD_LIBRARY(eo STATIC ${EO_SOURCES})
-INSTALL(TARGETS eo ARCHIVE DESTINATION local/${LIB} COMPONENT libraries)
+INSTALL(TARGETS eo ARCHIVE DESTINATION ${LIB} COMPONENT libraries)
 
 FILE(GLOB HDRS *.h eo)
-INSTALL(FILES ${HDRS} DESTINATION local/include${INSTALL_SUB_DIR}/eo COMPONENT headers)
+INSTALL(FILES ${HDRS} DESTINATION include${INSTALL_SUB_DIR}/eo COMPONENT headers)
 
 INSTALL(DIRECTORY do es ga gp other utils 
-        DESTINATION local/include${INSTALL_SUB_DIR}/eo 
+        DESTINATION include${INSTALL_SUB_DIR}/eo 
         COMPONENT headers
         FILES_MATCHING PATTERN "*.h" PATTERN "checkpointing" PATTERN external_eo
         )
diff --git a/eo/src/es/CMakeLists.txt b/eo/src/es/CMakeLists.txt
index b71260fb5..593f5df8f 100644
--- a/eo/src/es/CMakeLists.txt
+++ b/eo/src/es/CMakeLists.txt
@@ -38,10 +38,10 @@ SET(CMA_SOURCES
   )
 
 ADD_LIBRARY(es STATIC ${ES_SOURCES})
-INSTALL(TARGETS es ARCHIVE DESTINATION local/${LIB} COMPONENT libraries)
+INSTALL(TARGETS es ARCHIVE DESTINATION ${LIB} COMPONENT libraries)
 
 ADD_LIBRARY(cma STATIC ${CMA_SOURCES})
-INSTALL(TARGETS cma ARCHIVE DESTINATION local/${LIB} COMPONENT libraries)
+INSTALL(TARGETS cma ARCHIVE DESTINATION ${LIB} COMPONENT libraries)
 
 ######################################################################################
 ### 3) Optionnal
diff --git a/eo/src/ga/CMakeLists.txt b/eo/src/ga/CMakeLists.txt
index 22db30744..ffc6683f7 100644
--- a/eo/src/ga/CMakeLists.txt
+++ b/eo/src/ga/CMakeLists.txt
@@ -23,7 +23,7 @@ SET(GA_SOURCES
   )
 
 ADD_LIBRARY(ga STATIC ${GA_SOURCES})
-INSTALL(TARGETS ga ARCHIVE DESTINATION local/${LIB} COMPONENT libraries)
+INSTALL(TARGETS ga ARCHIVE DESTINATION ${LIB} COMPONENT libraries)
 
 ######################################################################################
 ### 3) Optionnal
diff --git a/eo/src/pyeo/CMakeLists.txt b/eo/src/pyeo/CMakeLists.txt
index 697c96a16..962692161 100644
--- a/eo/src/pyeo/CMakeLists.txt
+++ b/eo/src/pyeo/CMakeLists.txt
@@ -48,7 +48,7 @@ SET(EO_SOURCES
 
 # shared library
 ADD_LIBRARY(PyEO MODULE ${SOURCES} ${EO_SOURCES})
-INSTALL(TARGETS PyEO LIBRARY DESTINATION local/${LIB} COMPONENT libraries)
+INSTALL(TARGETS PyEO LIBRARY DESTINATION ${LIB} COMPONENT libraries)
 
 # python 2.5 must have pyd
 IF(WIN32 AND NOT CYGWIN)
diff --git a/eo/src/utils/CMakeLists.txt b/eo/src/utils/CMakeLists.txt
index ccb7efe81..ab1a6c826 100644
--- a/eo/src/utils/CMakeLists.txt
+++ b/eo/src/utils/CMakeLists.txt
@@ -33,7 +33,7 @@ SET(EOUTILS_SOURCES
   )
 
 ADD_LIBRARY(eoutils STATIC ${EOUTILS_SOURCES})
-INSTALL(TARGETS eoutils ARCHIVE DESTINATION local/${LIB} COMPONENT libraries)
+INSTALL(TARGETS eoutils ARCHIVE DESTINATION ${LIB} COMPONENT libraries)
 
 
 ######################################################################################
diff --git a/eo/test/CMakeLists.txt b/eo/test/CMakeLists.txt
index ed9575e85..860968ffb 100644
--- a/eo/test/CMakeLists.txt
+++ b/eo/test/CMakeLists.txt
@@ -93,7 +93,7 @@ ELSEIF(ENABLE_CMAKE_TESTING)
     ADD_EXECUTABLE(${test} ${T_${test}_SOURCES})
     ADD_TEST(${test} ${test})
     TARGET_LINK_LIBRARIES(${test} ga es cma eoutils eo)
-    INSTALL(TARGETS ${test} RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/eo/test COMPONENT test)
+    INSTALL(TARGETS ${test} RUNTIME DESTINATION share${INSTALL_SUB_DIR}/eo/test COMPONENT test)
   ENDFOREACH (test)
 
   SET(RESOURCES
diff --git a/eo/tutorial/Lesson1/CMakeLists.txt b/eo/tutorial/Lesson1/CMakeLists.txt
index bcad406f5..9f707750b 100644
--- a/eo/tutorial/Lesson1/CMakeLists.txt
+++ b/eo/tutorial/Lesson1/CMakeLists.txt
@@ -57,8 +57,8 @@ TARGET_LINK_LIBRARIES(exercise1.3 ga eo eoutils)
 ### 6) Configure project installation paths
 ######################################################################################
 
-INSTALL(TARGETS FirstBitGA RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/eo/examples/Lesson1 COMPONENT examples)
-INSTALL(TARGETS FirstRealGA RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/eo/examples/Lesson1 COMPONENT examples)
-INSTALL(TARGETS exercise1.3 RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/eo/examples/Lesson1 COMPONENT examples)
+INSTALL(TARGETS FirstBitGA RUNTIME DESTINATION share${INSTALL_SUB_DIR}/eo/examples/Lesson1 COMPONENT examples)
+INSTALL(TARGETS FirstRealGA RUNTIME DESTINATION share${INSTALL_SUB_DIR}/eo/examples/Lesson1 COMPONENT examples)
+INSTALL(TARGETS exercise1.3 RUNTIME DESTINATION share${INSTALL_SUB_DIR}/eo/examples/Lesson1 COMPONENT examples)
 
 ######################################################################################
diff --git a/eo/tutorial/Lesson2/CMakeLists.txt b/eo/tutorial/Lesson2/CMakeLists.txt
index 1b7c04999..28b4fada8 100644
--- a/eo/tutorial/Lesson2/CMakeLists.txt
+++ b/eo/tutorial/Lesson2/CMakeLists.txt
@@ -53,8 +53,8 @@ TARGET_LINK_LIBRARIES(exercise2.3 ga eo eoutils)
 ### 6) Configure project installation paths
 ######################################################################################
 
-INSTALL(TARGETS FirstBitEA RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/eo/examples/Lesson2 COMPONENT examples)
-INSTALL(TARGETS FirstRealEA RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/eo/examples/Lesson2 COMPONENT examples)
-INSTALL(TARGETS exercise2.3 RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/eo/examples/Lesson2 COMPONENT examples)
+INSTALL(TARGETS FirstBitEA RUNTIME DESTINATION share${INSTALL_SUB_DIR}/eo/examples/Lesson2 COMPONENT examples)
+INSTALL(TARGETS FirstRealEA RUNTIME DESTINATION share${INSTALL_SUB_DIR}/eo/examples/Lesson2 COMPONENT examples)
+INSTALL(TARGETS exercise2.3 RUNTIME DESTINATION share${INSTALL_SUB_DIR}/eo/examples/Lesson2 COMPONENT examples)
 
 ######################################################################################
diff --git a/eo/tutorial/Lesson3/CMakeLists.txt b/eo/tutorial/Lesson3/CMakeLists.txt
index e999e616a..0d5467d45 100644
--- a/eo/tutorial/Lesson3/CMakeLists.txt
+++ b/eo/tutorial/Lesson3/CMakeLists.txt
@@ -57,8 +57,8 @@ TARGET_LINK_LIBRARIES(exercise3.1 ga eoutils eo)
 ### 6) Configure project installation paths
 ######################################################################################
 
-INSTALL(TARGETS SecondBitEA RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/eo/examples/Lesson3 COMPONENT examples)
-INSTALL(TARGETS SecondRealEA RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/eo/examples/Lesson3 COMPONENT examples)
-INSTALL(TARGETS exercise3.1 RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/eo/examples/Lesson3 COMPONENT examples)
+INSTALL(TARGETS SecondBitEA RUNTIME DESTINATION share${INSTALL_SUB_DIR}/eo/examples/Lesson3 COMPONENT examples)
+INSTALL(TARGETS SecondRealEA RUNTIME DESTINATION share${INSTALL_SUB_DIR}/eo/examples/Lesson3 COMPONENT examples)
+INSTALL(TARGETS exercise3.1 RUNTIME DESTINATION share${INSTALL_SUB_DIR}/eo/examples/Lesson3 COMPONENT examples)
 
 ######################################################################################
diff --git a/eo/tutorial/Lesson4/CMakeLists.txt b/eo/tutorial/Lesson4/CMakeLists.txt
index 8048bdccc..f85b2898d 100644
--- a/eo/tutorial/Lesson4/CMakeLists.txt
+++ b/eo/tutorial/Lesson4/CMakeLists.txt
@@ -91,8 +91,8 @@ TARGET_LINK_LIBRARIES(ESEA es ga eo eoutils)
 ### 6) Configure project installation paths
 ######################################################################################
 
-INSTALL(TARGETS BitEA RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/eo/examples/Lesson4 COMPONENT examples)
-INSTALL(TARGETS RealEA RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/eo/examples/Lesson4 COMPONENT examples)
-INSTALL(TARGETS ESEA RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/eo/examples/Lesson4 COMPONENT examples)
+INSTALL(TARGETS BitEA RUNTIME DESTINATION share${INSTALL_SUB_DIR}/eo/examples/Lesson4 COMPONENT examples)
+INSTALL(TARGETS RealEA RUNTIME DESTINATION share${INSTALL_SUB_DIR}/eo/examples/Lesson4 COMPONENT examples)
+INSTALL(TARGETS ESEA RUNTIME DESTINATION share${INSTALL_SUB_DIR}/eo/examples/Lesson4 COMPONENT examples)
 
 ######################################################################################
diff --git a/eo/tutorial/Lesson5/CMakeLists.txt b/eo/tutorial/Lesson5/CMakeLists.txt
index 011687b8a..c79c45875 100644
--- a/eo/tutorial/Lesson5/CMakeLists.txt
+++ b/eo/tutorial/Lesson5/CMakeLists.txt
@@ -50,7 +50,7 @@ TARGET_LINK_LIBRARIES(OneMaxLibEA es ga eo eoutils)
 ### 6) Configure project installation paths
 ######################################################################################
 
-INSTALL(TARGETS OneMaxEA RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/eo/examples/Lesson5 COMPONENT examples)
-INSTALL(TARGETS OneMaxLibEA RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/eo/examples/Lesson5 COMPONENT examples)
+INSTALL(TARGETS OneMaxEA RUNTIME DESTINATION share${INSTALL_SUB_DIR}/eo/examples/Lesson5 COMPONENT examples)
+INSTALL(TARGETS OneMaxLibEA RUNTIME DESTINATION share${INSTALL_SUB_DIR}/eo/examples/Lesson5 COMPONENT examples)
 
 ######################################################################################
diff --git a/eo/tutorial/Lesson6/CMakeLists.txt b/eo/tutorial/Lesson6/CMakeLists.txt
index 8614165b5..b29e76fac 100644
--- a/eo/tutorial/Lesson6/CMakeLists.txt
+++ b/eo/tutorial/Lesson6/CMakeLists.txt
@@ -45,7 +45,7 @@ TARGET_LINK_LIBRARIES(RealPSO eo eoutils)
 ### 6) Configure project installation paths
 ######################################################################################
 
-INSTALL(TARGETS BinaryPSO RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/eo/examples/Lesson6 COMPONENT examples)
-INSTALL(TARGETS RealPSO RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/eo/examples/Lesson6 COMPONENT examples)
+INSTALL(TARGETS BinaryPSO RUNTIME DESTINATION share${INSTALL_SUB_DIR}/eo/examples/Lesson6 COMPONENT examples)
+INSTALL(TARGETS RealPSO RUNTIME DESTINATION share${INSTALL_SUB_DIR}/eo/examples/Lesson6 COMPONENT examples)
 
 ######################################################################################
diff --git a/mo/doc/CMakeLists.txt b/mo/doc/CMakeLists.txt
index 1709ce9cb..0d2692603 100755
--- a/mo/doc/CMakeLists.txt
+++ b/mo/doc/CMakeLists.txt
@@ -23,7 +23,7 @@ if(DOXYGEN_FOUND)
                    "${MO_DOC_DIR}/${MO_DOC_CONFIG_FILE}")
     install(
         DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-        DESTINATION local/share${INSTALL_SUB_DIR}/mo COMPONENT doc
+        DESTINATION share${INSTALL_SUB_DIR}/mo COMPONENT doc
         PATTERN "CMakeFiles" EXCLUDE
         PATTERN "cmake_install.cmake" EXCLUDE
         PATTERN "CTestTestfile.cmake" EXCLUDE
diff --git a/mo/src/CMakeLists.txt b/mo/src/CMakeLists.txt
index f3d589e4f..255559dfb 100644
--- a/mo/src/CMakeLists.txt
+++ b/mo/src/CMakeLists.txt
@@ -3,14 +3,14 @@
 ######################################################################################
 
 file(GLOB HDRS *.h mo)
-install(FILES ${HDRS} DESTINATION local/include${INSTALL_SUB_DIR}/mo COMPONENT headers)
+install(FILES ${HDRS} DESTINATION include${INSTALL_SUB_DIR}/mo COMPONENT headers)
 
 ######################################################################################
 ### 1) Install directories
 ######################################################################################
 
 install(DIRECTORY acceptCrit algo comparator continuator coolingSchedule eval explorer memory neighborhood perturb problems sampling
-        DESTINATION local/include${INSTALL_SUB_DIR}/mo 
+        DESTINATION include${INSTALL_SUB_DIR}/mo 
         COMPONENT headers
         FILES_MATCHING PATTERN "*.h"
         )
diff --git a/mo/test/CMakeLists.txt b/mo/test/CMakeLists.txt
index 17a34d036..1e600f3fc 100644
--- a/mo/test/CMakeLists.txt
+++ b/mo/test/CMakeLists.txt
@@ -106,7 +106,7 @@ foreach (test ${TEST_LIST})
     add_executable(${test} ${T_${test}_SOURCES}) 
     add_test(${test} ${test}) 
     target_link_libraries(${test} ga es eoutils eo)
-    install(TARGETS ${test} RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/mo/test COMPONENT tests)
+    install(TARGETS ${test} RUNTIME DESTINATION share${INSTALL_SUB_DIR}/mo/test COMPONENT tests)
 endforeach (test)
 
 
diff --git a/moeo/doc/CMakeLists.txt b/moeo/doc/CMakeLists.txt
index 4666a8a90..2b3b4e109 100644
--- a/moeo/doc/CMakeLists.txt
+++ b/moeo/doc/CMakeLists.txt
@@ -26,7 +26,7 @@ if(DOXYGEN_FOUND)
                    "${MOEO_DOC_DIR}/${MOEO_DOC_CONFIG_FILE}")
     install(
         DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-        DESTINATION local/share${INSTALL_SUB_DIR}/moeo COMPONENT doc
+        DESTINATION share${INSTALL_SUB_DIR}/moeo COMPONENT doc
         PATTERN "CMakeFiles" EXCLUDE
         PATTERN "cmake_install.cmake" EXCLUDE
         PATTERN "CTestTestfile.cmake" EXCLUDE
diff --git a/moeo/src/CMakeLists.txt b/moeo/src/CMakeLists.txt
index 41d315caf..6c645008b 100644
--- a/moeo/src/CMakeLists.txt
+++ b/moeo/src/CMakeLists.txt
@@ -23,21 +23,21 @@ add_library(moeo STATIC ${MOEO_CORE})
 set(MOEO_VERSION ${GLOBAL_VERSION})
 set_target_properties(moeo PROPERTIES VERSION "${MOEO_VERSION}")
 
-install(TARGETS moeo ARCHIVE DESTINATION local/${LIB} COMPONENT libraries)
+install(TARGETS moeo ARCHIVE DESTINATION ${LIB} COMPONENT libraries)
 
 ######################################################################################
 ### 3) Look for headers
 ######################################################################################
 
 file(GLOB HDRS moeo)
-install(FILES ${HDRS} DESTINATION local/include${INSTALL_SUB_DIR}/moeo COMPONENT headers)
+install(FILES ${HDRS} DESTINATION include${INSTALL_SUB_DIR}/moeo COMPONENT headers)
 
 ######################################################################################
 ### 4) Install directories
 ######################################################################################
 
 install(DIRECTORY acceptCrit algo archive comparator core distance diversity do explorer fitness hybridization metric replacement scalarStuffs selection utils
-        DESTINATION local/include${INSTALL_SUB_DIR}/moeo
+        DESTINATION include${INSTALL_SUB_DIR}/moeo
         COMPONENT headers
         FILES_MATCHING PATTERN "*.h"
         )
diff --git a/moeo/test/CMakeLists.txt b/moeo/test/CMakeLists.txt
index ca24363d0..49130ea3e 100644
--- a/moeo/test/CMakeLists.txt
+++ b/moeo/test/CMakeLists.txt
@@ -82,5 +82,5 @@ foreach (test ${TEST_LIST})
     add_executable(${test} ${T_${test}_SOURCES}) 
     add_test(${test} ${test}) 
     target_link_libraries(${test} moeo ga es eoutils eo)
-    install(TARGETS ${test} RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/moeo/test COMPONENT tests)
+    install(TARGETS ${test} RUNTIME DESTINATION share${INSTALL_SUB_DIR}/moeo/test COMPONENT tests)
 endforeach (test)
diff --git a/moeo/tutorial/examples/flowshop/CMakeLists.txt b/moeo/tutorial/examples/flowshop/CMakeLists.txt
index 5264c2eaa..fb57c07c9 100644
--- a/moeo/tutorial/examples/flowshop/CMakeLists.txt
+++ b/moeo/tutorial/examples/flowshop/CMakeLists.txt
@@ -33,17 +33,17 @@ add_dependencies(flowshop moeo)
 
 target_link_libraries(flowshop eo)
 
-install(TARGETS flowshop ARCHIVE DESTINATION local/${LIB} COMPONENT libraries)
+install(TARGETS flowshop ARCHIVE DESTINATION ${LIB} COMPONENT libraries)
 
 ######################################################################################
 ### 5) Installing benchs
 ######################################################################################
 
-install(DIRECTORY benchs DESTINATION local/include${INSTALL_SUB_DIR}/moeo/tutorial/flowshop COMPONENT tutorial)
+install(DIRECTORY benchs DESTINATION include${INSTALL_SUB_DIR}/moeo/tutorial/flowshop COMPONENT tutorial)
 
 ######################################################################################
 ### 6) Look for headers
 ######################################################################################
 
 file(GLOB HDRS *.h)
-install(FILES ${HDRS} DESTINATION local/include${INSTALL_SUB_DIR}/moeo/tutorial/examples/flowshop COMPONENT headers)
+install(FILES ${HDRS} DESTINATION include${INSTALL_SUB_DIR}/moeo/tutorial/examples/flowshop COMPONENT headers)
diff --git a/peo/doc/CMakeLists.txt b/peo/doc/CMakeLists.txt
index 831e58802..e7a8cb8d9 100644
--- a/peo/doc/CMakeLists.txt
+++ b/peo/doc/CMakeLists.txt
@@ -24,7 +24,7 @@ if(DOXYGEN_FOUND)
                    
     install(
         DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-        DESTINATION local/share${INSTALL_SUB_DIR}/peo COMPONENT doc
+        DESTINATION share${INSTALL_SUB_DIR}/peo COMPONENT doc
         PATTERN "CMakeFiles" EXCLUDE
         PATTERN "cmake_install.cmake" EXCLUDE
         PATTERN "CTestTestfile.cmake" EXCLUDE
diff --git a/peo/src/CMakeLists.txt b/peo/src/CMakeLists.txt
index 46373a280..dd66a6a0b 100644
--- a/peo/src/CMakeLists.txt
+++ b/peo/src/CMakeLists.txt
@@ -10,14 +10,14 @@ add_subdirectory(rmc)
 ######################################################################################
 
 file(GLOB HDRS peo)
-install(FILES ${HDRS} DESTINATION local/include${INSTALL_SUB_DIR}/peo COMPONENT headers)
+install(FILES ${HDRS} DESTINATION include${INSTALL_SUB_DIR}/peo COMPONENT headers)
 
 ######################################################################################
 ### 2) Install directories
 ######################################################################################
 
 install(DIRECTORY core rmc
-        DESTINATION local/include${INSTALL_SUB_DIR}/peo
+        DESTINATION include${INSTALL_SUB_DIR}/peo
         COMPONENT headers
         FILES_MATCHING PATTERN "*.h"
         )
diff --git a/peo/src/core/CMakeLists.txt b/peo/src/core/CMakeLists.txt
index e0c8e8a2a..19bf42b95 100644
--- a/peo/src/core/CMakeLists.txt
+++ b/peo/src/core/CMakeLists.txt
@@ -30,4 +30,4 @@ set(CORE_SOURCES 	peo_init.cpp
 
 add_library(peo STATIC ${CORE_SOURCES})
 
-install(TARGETS peo ARCHIVE DESTINATION local/${LIB} COMPONENT libraries)
+install(TARGETS peo ARCHIVE DESTINATION ${LIB} COMPONENT libraries)
diff --git a/peo/src/rmc/mpi/CMakeLists.txt b/peo/src/rmc/mpi/CMakeLists.txt
index c72a21279..4182d450f 100644
--- a/peo/src/rmc/mpi/CMakeLists.txt
+++ b/peo/src/rmc/mpi/CMakeLists.txt
@@ -39,4 +39,4 @@ set (RMC_MPI_SOURCES node.cpp
 						
 add_library(rmc_mpi STATIC ${RMC_MPI_SOURCES})
 add_dependencies(rmc_mpi peo)
-install(TARGETS rmc_mpi ARCHIVE DESTINATION local/${LIB} COMPONENT libraries)
+install(TARGETS rmc_mpi ARCHIVE DESTINATION ${LIB} COMPONENT libraries)
diff --git a/peo/test/CMakeLists.txt b/peo/test/CMakeLists.txt
index a8ec825a1..b86c5c616 100644
--- a/peo/test/CMakeLists.txt
+++ b/peo/test/CMakeLists.txt
@@ -45,7 +45,7 @@ execute_process(
 foreach (test ${TEST_RUN} ${TEST_LIST} ${TEST_STOP})
     set("T_${test}_SOURCES" "${test}.cpp")
     add_executable(${test} ${T_${test}_SOURCES})
-    install(TARGETS ${test} RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/peo/test COMPONENT tests)
+    install(TARGETS ${test} RUNTIME DESTINATION share${INSTALL_SUB_DIR}/peo/test COMPONENT tests)
 endforeach (test)
 	
 foreach (testrun ${TEST_RUN})
diff --git a/peo/tutorial/CMakeLists.txt b/peo/tutorial/CMakeLists.txt
index 2a3967c50..e64e07f34 100644
--- a/peo/tutorial/CMakeLists.txt
+++ b/peo/tutorial/CMakeLists.txt
@@ -17,4 +17,4 @@ execute_process(
             ${CMAKE_CURRENT_SOURCE_DIR}/benchs
             ${CMAKE_CURRENT_BINARY_DIR}/benchs)
             
-install(DIRECTORY benchs DESTINATION local/include${INSTALL_SUB_DIR}/peo/tutorial COMPONENT tutorial)
+install(DIRECTORY benchs DESTINATION include${INSTALL_SUB_DIR}/peo/tutorial COMPONENT tutorial)
diff --git a/smp/doc/CMakeLists.txt b/smp/doc/CMakeLists.txt
index e93a9d7c5..71b9d7822 100644
--- a/smp/doc/CMakeLists.txt
+++ b/smp/doc/CMakeLists.txt
@@ -23,7 +23,7 @@ if(DOXYGEN_FOUND)
                    "${SMP_DOC_DIR}/${SMP_DOC_CONFIG_FILE}")
     install(
         DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-        DESTINATION local/share${INSTALL_SUB_DIR}/smp COMPONENT doc
+        DESTINATION share${INSTALL_SUB_DIR}/smp COMPONENT doc
         PATTERN "CMakeFiles" EXCLUDE
         PATTERN "cmake_install.cmake" EXCLUDE
         PATTERN "CTestTestfile.cmake" EXCLUDE
diff --git a/smp/src/CMakeLists.txt b/smp/src/CMakeLists.txt
index dafbaa3eb..a7b9a268c 100644
--- a/smp/src/CMakeLists.txt
+++ b/smp/src/CMakeLists.txt
@@ -22,21 +22,21 @@ set (SMP_FILE
 
 add_library(smp STATIC ${SMP_FILE})
 
-install(TARGETS smp ARCHIVE DESTINATION local/${LIB} COMPONENT libraries)
+install(TARGETS smp ARCHIVE DESTINATION ${LIB} COMPONENT libraries)
 
 ######################################################################################
 ### 3) Look for headers
 ######################################################################################
 
 file(GLOB HDRS smp *.h)
-install(FILES ${HDRS} DESTINATION local/include${INSTALL_SUB_DIR}/smp COMPONENT headers)
+install(FILES ${HDRS} DESTINATION include${INSTALL_SUB_DIR}/smp COMPONENT headers)
 
 ######################################################################################
 ### 4) Install directories
 ######################################################################################
 
 install(DIRECTORY MWAlgo
-        DESTINATION local/include${INSTALL_SUB_DIR}/smp
+        DESTINATION include${INSTALL_SUB_DIR}/smp
         COMPONENT headers
         FILES_MATCHING PATTERN "*.h"
         )
diff --git a/smp/test/CMakeLists.txt b/smp/test/CMakeLists.txt
index f2e6648e6..cd3a1eebe 100644
--- a/smp/test/CMakeLists.txt
+++ b/smp/test/CMakeLists.txt
@@ -27,11 +27,11 @@ foreach (test ${TEST_LIST})
     add_executable(${test} ${T_${test}_SOURCES})
     target_link_libraries(${test} smp eo eoutils)
     add_test(${test} ${test}) 
-    install(TARGETS ${test} RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/smp/test COMPONENT tests)
+    install(TARGETS ${test} RUNTIME DESTINATION share${INSTALL_SUB_DIR}/smp/test COMPONENT tests)
 endforeach (test)
 
 execute_process(
     COMMAND ${CMAKE_COMMAND} -E copy_if_different
     ${CMAKE_CURRENT_SOURCE_DIR}/t-data.dat
     ${CMAKE_CURRENT_BINARY_DIR}/t-data.dat)
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/t-data.datgi DESTINATION local/share${INSTALL_SUB_DIR}/smp/test COMPONENT tests)
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/t-data.dat DESTINATION share${INSTALL_SUB_DIR}/smp/test COMPONENT tests)