Index: /trunk/FACT++/CMakeLists.txt
===================================================================
--- /trunk/FACT++/CMakeLists.txt	(revision 20075)
+++ /trunk/FACT++/CMakeLists.txt	(revision 20076)
@@ -51,4 +51,9 @@
 
 PROJECT(fact++ VERSION ${VERSION})
+
+# ======== For config.h.in =========
+SET(PACKAGE_MAINTAINER "Thomas Bretz")
+SET(PACKAGE_BUGREPORT  "tbretz@physik.rwth-aachen.de")
+SET(PACKAGE_URL        "https://www.fact-project.org")
 
 # *************************************
@@ -520,5 +525,6 @@
          -DPACKAGE_STRING=\\\"FACT++\\\" \
          -DPACKAGE_URL=\\\"${PACKAGE_URL}\\\" \
-         -DPACKAGE_BUGREPORT=\\\"${PACKAGE_BUGREPORT}\\\""
+         -DPACKAGE_BUGREPORT=\\\"${PACKAGE_BUGREPORT}\\\" \
+         -DPACKAGE_INSTALL_SYSCONFDIR=\\\"${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_SYSCONFDIR}\\\""
          )
 
@@ -531,10 +537,4 @@
 # Flags required for Dim
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pedantic -DMIPSEL -DPROTOCOL=1 -Dunix -Dlinux")
-
-
-# ======== For config.h.in =========
-SET(PACKAGE_MAINTAINER "Thomas Bretz")
-SET(PACKAGE_BUGREPORT  "tbretz@physik.rwth-aachen.de")
-SET(PACKAGE_URL        "https://www.fact-project.org")
 
 
@@ -1388,25 +1388,28 @@
 
 # Prepare the file for build interface
-SET(INSTALL_PREFIX ${CMAKE_BINARY_DIR})
+SET(PROJECT_ETCDIR ${CMAKE_BINARY_DIR})
+SET(PROJECT_LOGDIR ${CMAKE_BINARY_DIR}/log)
+FILE(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/log)
 CONFIGURE_FILE(fact++.rc.in fact++.rc @ONLY)
 
-FILE(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/rc)
-FILE(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/log)
+#FILE(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/rc)
 
 IF(NOT CMAKE_INSTALL_PREFIX STREQUAL CMAKE_INSTALL_PREFIX_DEFAULT)
-
-    # Prepare default fact++.rc for installation
-    SET(INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
-    CONFIGURE_FILE(fact++.rc.in fact++rc.install @ONLY)
-    INSTALL(FILES ${CMAKE_BINARY_DIR}/fact++rc.install DESTINATION ${CMAKE_INSTALL_BINDIR} RENAME fact++.rc)
-
-    # Create empty directories during installation
+    SET(PROJECT_ETCDIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_SYSCONFDIR})
+    SET(PROJECT_LOGDIR ${CMAKE_INSTALL_PREFIX}/log)
     INSTALL(DIRECTORY "log" DESTINATION ${CMAKE_INSTALL_PREFIX})
-    INSTALL(DIRECTORY "rc"  DESTINATION ${CMAKE_INSTALL_PREFIX})
-
-    INSTALL(CODE "MESSAGE(STATUS \"Preparing environment.\")")
-    # This is just for convenience as the fact++.rc is read from the directory of the binary itself
-    INSTALL(CODE "EXECUTE_PROCESS(COMMAND ln -sf ${CMAKE_INSTALL_BINDIR}/fact++.rc WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX})")
-ENDIF()
+ELSE()
+    SET(PROJECT_ETCDIR ${CMAKE_INSTALL_SYSCONFDIR}/fact++)
+    SET(PROJECT_LOGDIR ${CMAKE_INSTALL_LOCALSTATEDIR}/log/fact++)
+    INSTALL(DIRECTORY "fact++" DESTINATION ${CMAKE_INSTALL_SYSCONFDIR})
+    INSTALL(DIRECTORY "log/fact++" DESTINATION ${CMAKE_INSTALL_LOCALSTATEDIR})
+ENDIF()
+
+# Prepare default fact++.rc for installation
+#SET(INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})
+CONFIGURE_FILE(fact++.rc.in fact++rc.install @ONLY)
+INSTALL(FILES ${CMAKE_BINARY_DIR}/fact++rc.install DESTINATION ${CMAKE_INSTALL_SYSCONFDIR} RENAME fact++.rc)
+
+# Create empty directories during installation