p
/
desktop-tools
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Try to fix OBS build

This commit is contained in:
Přemysl Eric Janouch 2016-12-30 15:52:59 +01:00
parent 617bc12ea2
commit ae0c29559c
Signed by: p
GPG Key ID: B715679E3A361BE6
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -60,11 +60,15 @@ target_link_libraries (big-brother ${project_libraries})
# The files to be installed # The files to be installed
include (GNUInstallDirs) 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 configure_file (${PROJECT_SOURCE_DIR}/fancontrol-ng.service.in
${PROJECT_BINARY_DIR}/fancontrol-ng.service @ONLY) ${PROJECT_BINARY_DIR}/fancontrol-ng.service @ONLY)
# System-wide unit files should be installed under /lib and not /usr/lib # System-wide unit files should be installed under /lib and not /usr/lib
install (FILES ${PROJECT_BINARY_DIR}/fancontrol-ng.service install (FILES ${PROJECT_BINARY_DIR}/fancontrol-ng.service
DESTINATION /lib/systemd/system) DESTINATION "${SYSTEMD_UNITDIR}")
install (FILES fancontrol-ng.conf.example install (FILES fancontrol-ng.conf.example
DESTINATION ${CMAKE_INSTALL_DATADIR}/fancontrol-ng) DESTINATION ${CMAKE_INSTALL_DATADIR}/fancontrol-ng)

1
wmstatus.c
View File

@ -969,7 +969,6 @@ nut_client_connect
// --- Backends ---------------------------------------------------------------- // --- Backends ----------------------------------------------------------------
// TODO: rename the whole application to just wmstatus
struct backend struct backend
{ {
/// Initialization /// Initialization