Merge branch 'develop' into 'master'

Develop

See merge request !3

CMakeLists.txt

@@ -7,6 +7,8 @@ set(wcrft2_ver_major "1")
 set(wcrft2_ver_minor "0")
 set(wcrft2_ver_patch "0")
 
+set(CMAKE_INSTALL_PREFIX /usr/)
+
 set(WCRFT2_VERSION
 	"${wcrft2_ver_major}.${wcrft2_ver_minor}.${wcrft2_ver_patch}")
 

libwcrft/CMakeLists.txt

 PROJECT(wcrft)
 
-set(WCRFT_INSTALL_DATA_DIR share/wcrft)
+set(CMAKE_INSTALL_PREFIX /usr/)
+set(WCRFT_INSTALL_DATA_DIR /share/wcrft)
 
 set(libwcrft_VER_MAJOR 2)
 set(libwcrft_VER_MINOR 0)
@@ -62,7 +63,7 @@ install(
 				   PATTERN "settings.h")
 
 # install config and model dirs
-set(libwcrft_INSTALL_DATA_DIR share/wcrft)
+set(libwcrft_INSTALL_DATA_DIR ${CMAKE_INSTALL_PREFIX}/share/wcrft)
 
 find_path(libwcrft_SRC_CONFIG_DIR
 	config