From d76a28c80a4a7d021a1f53b0a1ebb8df4362a11a Mon Sep 17 00:00:00 2001
From: Nils Wentzell <nwentzell@flatironinstitute.org>
Date: Wed, 23 Sep 2020 12:10:27 -0400
Subject: [PATCH] [cmake] Install app4triqsvars.sh into subdirectory of share
 only for non-system install prefix

---
 doc/install.rst      |  2 +-
 share/CMakeLists.txt | 27 ++++++++++++++++++---------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/doc/install.rst b/doc/install.rst
index d8668c58..12f1855f 100644
--- a/doc/install.rst
+++ b/doc/install.rst
@@ -25,7 +25,7 @@ Installation steps
 
 #. Ensure that your shell contains the TRIQS environment variables by sourcing the ``triqsvars.sh`` file from your TRIQS installation::
 
-     $ source path_to_triqs/share/triqsvarsh.sh
+     $ source path_to_triqs/share/triqs/triqsvars.sh
 
 #. In the build directory call cmake, including any additional custom CMake options, see below::
 
diff --git a/share/CMakeLists.txt b/share/CMakeLists.txt
index f6da5199..8d258a5f 100644
--- a/share/CMakeLists.txt
+++ b/share/CMakeLists.txt
@@ -1,6 +1,10 @@
 add_subdirectory(cmake)
 
-if(NOT CMAKE_INSTALL_PREFIX STREQUAL TRIQS_ROOT AND NOT IS_SUBPROJECT)
+if(NOT IS_SUBPROJECT
+  AND NOT CMAKE_INSTALL_PREFIX STREQUAL TRIQS_ROOT
+  AND NOT CMAKE_INSTALL_PREFIX STREQUAL "/usr"
+  AND NOT CMAKE_INSTALL_PREFIX STREQUAL "/usr/local"
+)
 
   if(PythonSupport)
     set(EXPORT_PYTHON_PATH "export PYTHONPATH=${CMAKE_INSTALL_PREFIX}/${CPP2PY_PYTHON_LIB_DEST_ROOT}:$PYTHONPATH")
@@ -14,15 +18,20 @@ if(NOT CMAKE_INSTALL_PREFIX STREQUAL TRIQS_ROOT AND NOT IS_SUBPROJECT)
     FILES
       ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.modulefile
       ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}vars.sh
-    DESTINATION share
+    DESTINATION share/${PROJECT_NAME}
   )
  
-  message(STATUS "***************************************************************")
-  message(STATUS "* Custom install Location. Use:                                ")
-  message(STATUS "*                                                              ")
-  message(STATUS "*   source ${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}vars.sh      ")
-  message(STATUS "*                                                              ")
-  message(STATUS "* to set up the environment variables                          ")
-  message(STATUS "***************************************************************")
+  message(STATUS "*********************************************************************************")
+  message(STATUS "* Custom install Location. Use:                                                  ")
+  message(STATUS "*                                                                                ")
+  message(STATUS "*   source ${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}/${PROJECT_NAME}vars.sh  ")
+  message(STATUS "*                                                                                ")
+  message(STATUS "* to set up the environment variables                                            ")
+  if(DEFINED ENV{MODULEPATH})
+    message(STATUS "*                                                                          ")
+    message(STATUS "* Consider copying ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.modulefile  ")
+    message(STATUS "*   into your environment module directories                               ")
+  endif()
+  message(STATUS "*********************************************************************************")
 
 endif()