dolfin team mailing list archive

["Garth N. Wells" <gnw20@xxxxxxxxx>]

dolfin.conf is helper file, not a config file. Seems wrong to me to put it
in etc.

Garth

---------- Forwarded message ----------
From: **
Date: Tuesday, 30 October 2012
Subject: [Branch ~dolfin-core/dolfin/trunk] Rev 7051: Move installation of
dolfin.conf from $prefix/share/dolfin to $prefix/etc
To: Garth Wells <gnw20@xxxxxxxxx>


------------------------------------------------------------
revno: 7051
committer: Anders Logg <logg@glaurung>
branch nick: trunk-logg
timestamp: Tue 2012-10-30 12:42:01 -0700
message:
  Move installation of dolfin.conf from $prefix/share/dolfin to $prefix/etc
  since it is a config file. Want to generate a corresponding fenics.conf
  in the same directory when new Dorsal build is fully functional.
modified:
  CMakeLists.txt
  cmake/post-install/CMakeLists.txt


--
lp:dolfin
https://code.launchpad.net/~dolfin-core/dolfin/trunk

Your team DOLFIN Core Team is subscribed to branch lp:dolfin.
To unsubscribe from this branch go to
https://code.launchpad.net/~dolfin-core/dolfin/trunk/+edit-subscription



-- 
Garth N. Wells
Department of Engineering, University of Cambridge
http://www.eng.cam.ac.uk/~gnw20

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2012-10-29 11:35:54 +0000
+++ CMakeLists.txt	2012-10-30 19:42:01 +0000
@@ -574,6 +574,7 @@
 set(DOLFIN_SHARE_DIR "share/dolfin" CACHE PATH "Shared data installation directory.")
 set(DOLFIN_MAN_DIR "share/man" CACHE PATH "Manual page installation directory.")
 set(DOLFIN_DOC_DIR "${DOLFIN_SHARE_DIR}/doc" CACHE PATH "DOLFIN Documentation directory.")
+set(DOLFIN_ETC_DIR "etc" CACHE PATH "Configuration file directory.")
 
 # Add source directory
 add_subdirectory(dolfin)
@@ -614,7 +615,7 @@
 configure_file(${DOLFIN_CMAKE_DIR}/templates/dolfin.conf.in
                ${CMAKE_BINARY_DIR}/dolfin.conf @ONLY)
 install(FILES ${CMAKE_BINARY_DIR}/dolfin.conf
-        DESTINATION ${DOLFIN_SHARE_DIR}
+        DESTINATION ${DOLFIN_ETC_DIR}
         COMPONENT Development)
 
 #------------------------------------------------------------------------------

=== modified file 'cmake/post-install/CMakeLists.txt'
--- cmake/post-install/CMakeLists.txt	2011-06-21 14:47:41 +0000
+++ cmake/post-install/CMakeLists.txt	2012-10-30 19:42:01 +0000
@@ -15,7 +15,7 @@
 
 To update your environment variables, run the following command:
 
-    source ${CMAKE_INSTALL_PREFIX}/${DOLFIN_SHARE_DIR}/dolfin.conf
+    source ${CMAKE_INSTALL_PREFIX}/${DOLFIN_ETC_DIR}/dolfin.conf
 
 For future reference, we recommend that you add this command to your
 configuration (.bashrc, .profile or similar).