aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPřemysl Janouch <p.janouch@gmail.com>2016-12-30 15:52:59 +0100
committerPřemysl Janouch <p.janouch@gmail.com>2016-12-30 15:52:59 +0100
commitae0c29559c1ef04118445d4c163ca8fd37942fc9 (patch)
treee02b944a5090cfc00ea2f53a23c2af694850cbb4
parent617bc12ea2842a708bd958a3ed478f663d43fddc (diff)
downloaddesktop-tools-ae0c29559c1ef04118445d4c163ca8fd37942fc9.tar.gz
desktop-tools-ae0c29559c1ef04118445d4c163ca8fd37942fc9.tar.xz
desktop-tools-ae0c29559c1ef04118445d4c163ca8fd37942fc9.zip
Try to fix OBS build
-rw-r--r--CMakeLists.txt6
-rw-r--r--wmstatus.c1
2 files changed, 5 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5c2f5ba..31cbfa1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,11 +60,15 @@ target_link_libraries (big-brother ${project_libraries})
# The files to be installed
include (GNUInstallDirs)
+# We have to put this under /usr on Open Build Service RPM distros, no idea why
+set (SYSTEMD_UNITDIR /lib/systemd/system
+ CACHE PATH "Base directory for systemd unit files")
+
configure_file (${PROJECT_SOURCE_DIR}/fancontrol-ng.service.in
${PROJECT_BINARY_DIR}/fancontrol-ng.service @ONLY)
# System-wide unit files should be installed under /lib and not /usr/lib
install (FILES ${PROJECT_BINARY_DIR}/fancontrol-ng.service
- DESTINATION /lib/systemd/system)
+ DESTINATION "${SYSTEMD_UNITDIR}")
install (FILES fancontrol-ng.conf.example
DESTINATION ${CMAKE_INSTALL_DATADIR}/fancontrol-ng)
diff --git a/wmstatus.c b/wmstatus.c
index f351cd3..4f1c434 100644
--- a/wmstatus.c
+++ b/wmstatus.c
@@ -969,7 +969,6 @@ nut_client_connect
// --- Backends ----------------------------------------------------------------
-// TODO: rename the whole application to just wmstatus
struct backend
{
/// Initialization