From ae0c29559c1ef04118445d4c163ca8fd37942fc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emysl=20Janouch?= Date: Fri, 30 Dec 2016 15:52:59 +0100 Subject: Try to fix OBS build --- CMakeLists.txt | 6 +++++- wmstatus.c | 1 - 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 -- cgit v1.2.3