diff options
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | conf/system/afm-system-daemon.service.in | 2 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 76753b0..3d1ce1b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,6 +41,7 @@ set(SIMULATE_SMACK OFF CACHE BOOL "if set, the smack environment is simulated") set(afm_name "afm" CACHE STRING "Name for application framework user") set(afm_confdir "${CMAKE_INSTALL_FULL_SYSCONFDIR}/${afm_name}" CACHE STRING "Directory for configuration files") set(afm_datadir "${CMAKE_INSTALL_FULL_DATADIR}/${afm_name}" CACHE STRING "Root directory for installions") +set(afm_libexecdir "${CMAKE_INSTALL_FULL_LIBEXECDIR}/${afm_name}" CACHE STRING "Directory for installing internal binaries") set(afm_appdir "${afm_datadir}/applications" CACHE STRING "Directory for installing applications") set(afm_icondir "${afm_datadir}/icons" CACHE STRING "Directory for installing icons") set(afm_prefix "urn:AGL:" CACHE STRING "Prefix for uniform resource name") diff --git a/conf/system/afm-system-daemon.service.in b/conf/system/afm-system-daemon.service.in index f5227dd..fa83f11 100644 --- a/conf/system/afm-system-daemon.service.in +++ b/conf/system/afm-system-daemon.service.in @@ -6,7 +6,7 @@ Requires=afm-system-setup.service #User=afm #Group=afm SyslogIdentifier=afm-system-daemon -ExecStart=/usr/bin/afb-daemon --name=afm-system-daemon --no-httpd --no-ldpaths --binding=@CMAKE_INSTALL_FULL_LIBEXECDIR@/afm/afm-binding.so --ws-server=sd:afm-main +ExecStart=/usr/bin/afb-daemon --name=afm-system-daemon --no-httpd --no-ldpaths --binding=@afm_libexecdir@/afm-binding.so --ws-server=sd:afm-main Restart=on-failure RestartSec=5 CapabilityBoundingSet=CAP_DAC_OVERRIDE CAP_MAC_OVERRIDE diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 79da722..8f081ee 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -180,7 +180,7 @@ if(libsystemd_FOUND AND AFB_FOUND) PREFIX "" LINK_FLAGS "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/afm-binding.export-map" ) - install(TARGETS afm-binding LIBRARY DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/afm) + install(TARGETS afm-binding LIBRARY DESTINATION ${afm_libexecdir}) add_executable(afm-user-session afm-user-session.c) install(TARGETS afm-user-session DESTINATION ${CMAKE_INSTALL_BINDIR} |