hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Install all /var directories

Browse Source 
The /var/lib/maxscale directory wasn't installed and tarballs didn't have
any /var directories.
This commit is contained in:
Markus Makela
2016-09-21 09:40:15 +03:00
parent ba2cafc65e
commit f6888ef205
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -370,8 +370,9 @@ endif()
# NOTE: If you make changes here, ensure they are compatible with the # NOTE: If you make changes here, ensure they are compatible with the
# situation in gwdirs.h.in. # 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/cache/maxscale)
install(DIRECTORY DESTINATION var/log/maxscale) install(DIRECTORY DESTINATION var/log/maxscale)
install(DIRECTORY DESTINATION var/run/maxscale) install(DIRECTORY DESTINATION var/run/maxscale)
install(DIRECTORY DESTINATION var/lib/maxscale)
endif() endif()

6
cmake/package_tgz.cmake
View File

@ -12,6 +12,12 @@ set(CMAKE_INSTALL_RPATH "$ORIGIN/../lib" CACHE PATH "" FORCE)
set(CMAKE_INSTALL_DATADIR /share CACHE PATH "" FORCE) set(CMAKE_INSTALL_DATADIR /share CACHE PATH "" FORCE)
set(CPACK_GENERATOR "TGZ") set(CPACK_GENERATOR "TGZ")
# Include the var directories in the tarball
install(DIRECTORY DESTINATION var/cache/maxscale)
install(DIRECTORY DESTINATION var/log/maxscale)
install(DIRECTORY DESTINATION var/run/maxscale)
install(DIRECTORY DESTINATION var/lib/maxscale)
if(DISTRIB_SUFFIX) if(DISTRIB_SUFFIX)
set(CPACK_PACKAGE_FILE_NAME "maxscale-${MAXSCALE_VERSION}.${DISTRIB_SUFFIX}") set(CPACK_PACKAGE_FILE_NAME "maxscale-${MAXSCALE_VERSION}.${DISTRIB_SUFFIX}")
else() else()