Merge branch '2.0' into develop-2.0-merge

2016-09-21 14:59:30 +03:00
parent ca9021b835 0882541c80
commit eaf43ca92d
6 changed files with 82 additions and 33 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -304,8 +304,9 @@ endif()

 # NOTE: If you make changes here, ensure they are compatible with the
 #       situation in gwdirs.h.in.
-if (NOT CMAKE_INSTALL_PREFIX EQUAL "/usr")
+if (NOT PACKAGE)
  install(DIRECTORY DESTINATION var/cache/maxscale)
  install(DIRECTORY DESTINATION var/log/maxscale)
  install(DIRECTORY DESTINATION var/run/maxscale)
+  install(DIRECTORY DESTINATION var/lib/maxscale)
 endif()