Browse Source

* add 'statedir' to config & cmake paths

master
Alex 'AdUser' Z 8 years ago
parent
commit
294bc993b9
  1. 2
      CMakeLists.txt
  2. 1
      configs/f2b.conf.in

2
CMakeLists.txt

@ -19,6 +19,7 @@ endif ()
# HACK: cmake >= 3.4 fixes this # HACK: cmake >= 3.4 fixes this
if (CMAKE_INSTALL_PREFIX MATCHES "^/usr/?$") if (CMAKE_INSTALL_PREFIX MATCHES "^/usr/?$")
set(CMAKE_INSTALL_SYSCONFDIR "/etc") set(CMAKE_INSTALL_SYSCONFDIR "/etc")
set(CMAKE_INSTALL_LOCALSTATEDIR "/var")
endif () endif ()
include(GNUInstallDirs) include(GNUInstallDirs)
@ -44,6 +45,7 @@ message(STATUS "- configs : ${CMAKE_INSTALL_FULL_SYSCONFDIR}")
message(STATUS "- binary : ${CMAKE_INSTALL_FULL_BINDIR}") message(STATUS "- binary : ${CMAKE_INSTALL_FULL_BINDIR}")
message(STATUS "- binary : ${CMAKE_INSTALL_FULL_SBINDIR}") message(STATUS "- binary : ${CMAKE_INSTALL_FULL_SBINDIR}")
message(STATUS "- data : ${CMAKE_INSTALL_FULL_DATAROOTDIR}") message(STATUS "- data : ${CMAKE_INSTALL_FULL_DATAROOTDIR}")
message(STATUS "- state : ${CMAKE_INSTALL_FULL_LOCALSTATEDIR}")
message(STATUS "Build type : ${CMAKE_BUILD_TYPE}") message(STATUS "Build type : ${CMAKE_BUILD_TYPE}")
message(STATUS "Options:") message(STATUS "Options:")
message(STATUS "- WITH_CLIENT : ${WITH_CLIENT}") message(STATUS "- WITH_CLIENT : ${WITH_CLIENT}")

1
configs/f2b.conf.in

@ -1,6 +1,7 @@
[main] [main]
includes = ${CMAKE_INSTALL_FULL_SYSCONFDIR}/f2b/conf-enabled includes = ${CMAKE_INSTALL_FULL_SYSCONFDIR}/f2b/conf-enabled
pidfile = /var/run/f2b.pid pidfile = /var/run/f2b.pid
statedir = ${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/lib/f2b
logdest = syslog logdest = syslog
loglevel = info loglevel = info
logfile = /var/log/f2b.log logfile = /var/log/f2b.log

Loading…
Cancel
Save