From db3df319ed47ac16b16765435de1d3eba5869d3f Mon Sep 17 00:00:00 2001
From: Jean-Paul Chaput <Jean-Paul.Chaput@lip6.fr>
Date: Tue, 18 May 2010 12:53:10 +0000
Subject: [PATCH]   * All tools:     - Change: adopt a tree layout compliant
 with the UNIX FHS.         * includes under      TOP/include/coriolis2.      
   * shared datas under  TOP/shared/coriolis2.         * docs under         
 TOP/share/doc/coriolis2.         * configuration under TOP/etc/coriolis2

  * ./crlcore:
    - Change: In Environment, comply to the new tree layout, search configuration
        files under TOP/etc/coriolis2/.

  * ./knik:
    - Change: In flute, comply to the new tree layout, get the "POW*.dat" files
        from TOP/share/coriolis2/flute-2.4.
---
 kite/CMakeLists.txt               | 4 ++--
 kite/cmake_modules/CMakeLists.txt | 2 +-
 kite/doc/CMakeLists.txt           | 4 ++--
 kite/src/CMakeLists.txt           | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/kite/CMakeLists.txt b/kite/CMakeLists.txt
index 33ce7f17..2e2b9f2a 100644
--- a/kite/CMakeLists.txt
+++ b/kite/CMakeLists.txt
@@ -23,13 +23,13 @@ ENDIF(COMMAND CMAKE_POLICY)
 MACRO(SETUP_PROJECT_PATHS project)
   IF( NOT("$ENV{${project}_TOP}" STREQUAL "") )
     MESSAGE("-- ${project}_TOP is set to $ENV{${project}_TOP}")
-    SET(PROJECT_MODULE_PATH "$ENV{${project}_TOP}/share/cmake_modules/")
+    SET(PROJECT_MODULE_PATH "$ENV{${project}_TOP}/share/cmake/Modules/")
     LIST(INSERT CMAKE_MODULE_PATH 0 "${PROJECT_MODULE_PATH}")
   ENDIF( NOT("$ENV{${project}_TOP}" STREQUAL "") )
 
   IF( NOT("$ENV{${project}_USER_TOP}" STREQUAL "") )
     MESSAGE("-- ${project}_USER_TOP is set to $ENV{${project}_USER_TOP}")
-    SET(PROJECT_MODULE_PATH   "$ENV{${project}_USER_TOP}/share/cmake_modules/")
+    SET(PROJECT_MODULE_PATH   "$ENV{${project}_USER_TOP}/share/cmake/Modules/")
     LIST(INSERT CMAKE_MODULE_PATH 0 "${PROJECT_MODULE_PATH}")
   ENDIF( NOT("$ENV{${project}_USER_TOP}" STREQUAL "") )
 
diff --git a/kite/cmake_modules/CMakeLists.txt b/kite/cmake_modules/CMakeLists.txt
index 4825d1b1..39590539 100644
--- a/kite/cmake_modules/CMakeLists.txt
+++ b/kite/cmake_modules/CMakeLists.txt
@@ -1 +1 @@
-install ( FILES FindKITE.cmake DESTINATION share/cmake_modules ) 
+install ( FILES FindKITE.cmake DESTINATION share/cmake/Modules ) 
diff --git a/kite/doc/CMakeLists.txt b/kite/doc/CMakeLists.txt
index 681dd933..0e41c9e0 100644
--- a/kite/doc/CMakeLists.txt
+++ b/kite/doc/CMakeLists.txt
@@ -1,6 +1,6 @@
 
-               set ( htmlInstallDir  share/doc/en/html/kite )
-               set ( latexInstallDir share/doc/en/latex/kite )
+               set ( htmlInstallDir  share/doc/coriolis2/en/html/kite )
+               set ( latexInstallDir share/doc/coriolis2/en/latex/kite )
 
  add_custom_target ( doc ALL cd ${KITE_SOURCE_DIR}/doc && ${DOXYGEN_EXECUTABLE} doxyfile )
 
diff --git a/kite/src/CMakeLists.txt b/kite/src/CMakeLists.txt
index 53a3a3bb..e65a2868 100644
--- a/kite/src/CMakeLists.txt
+++ b/kite/src/CMakeLists.txt
@@ -99,5 +99,5 @@
                install ( TARGETS          kite-text DESTINATION bin )
 
                install ( FILES       ${includes}
-                                     ${mocIncludes} DESTINATION include/coriolis/kite ) 
+                                     ${mocIncludes} DESTINATION include/coriolis2/kite )