In Fedora 17 (and, presumably, later), the correct location for systemd
unit files depends on the build prefix (i.e. it will normally be under
/usr), whereas in Fedora 15/16 it did not. So pass the correct location
from the spec file, and only fall back to the default if it is not
specified.
Signed-off-by: Zane Bitter <zbitter(a)redhat.com>
---
CMakeLists.txt | 1 +
matahari.spec.in | 2 +-
src/CMakeLists.txt | 3 ---
sys/CMakeLists.txt | 2 --
4 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4a00c47..7b7475b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,6 +30,7 @@ inherit_value(QPID_PATH "C:/Program Files/Apache/qpid-0.6")
inherit_value(localstatedir "/var")
inherit_value(sysconfdir "${SYSCONF_INSTALL_DIR}")
inherit_value(initdir "${SYSCONF_INSTALL_DIR}/init.d")
+inherit_value(systemdunitdir "/lib/systemd/system")
# Add sub-directories
add_subdirectory(src)
diff --git a/matahari.spec.in b/matahari.spec.in
index 6180621..6beaee5 100644
--- a/matahari.spec.in
+++ b/matahari.spec.in
@@ -292,7 +292,7 @@ QMF console for monitoring various agents
%setup -q -n matahari-matahari-%{upstream_version}
%build
-%{cmake} -DCMAKE_BUILD_TYPE=RelWithDebInfo %{!?with_qmf: -DWITH-QMF:BOOL=OFF}
%{!?with_dbus: -DWITH-DBUS:BOOL=OFF} -Dinitdir=%{_initddir} -Dsysconfdir=%{_sysconfdir} .
+%{cmake} -DCMAKE_BUILD_TYPE=RelWithDebInfo %{!?with_qmf: -DWITH-QMF:BOOL=OFF}
%{!?with_dbus: -DWITH-DBUS:BOOL=OFF} -Dinitdir=%{_initddir} -Dsysconfdir=%{_sysconfdir}
-Dsystemdunitdir=%{_unitdir} .
make -f Makefile %{?_smp_mflags}
%if %{defined run_unit_tests}
cd src/tests && ctest -V
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8b57393..98aa5bf 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -68,9 +68,6 @@ check_function_exists (time HAVE_TIME)
## Modules
# systemd
pkg_check_modules(systemd systemd)
-if(systemd_FOUND)
- set(systemdunitdir "/lib/systemd/system")
-endif(systemd_FOUND)
# pcre
pkg_check_modules(pcre REQUIRED libpcre)
diff --git a/sys/CMakeLists.txt b/sys/CMakeLists.txt
index 2cfba1c..2e2f575 100644
--- a/sys/CMakeLists.txt
+++ b/sys/CMakeLists.txt
@@ -77,8 +77,6 @@ include(FindPkgConfig)
pkg_check_modules(systemd systemd)
if(systemd_FOUND)
- set(systemdunitdir "/lib/systemd/system")
-
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/matahari-vios-proxy-host.service.in
${CMAKE_CURRENT_BINARY_DIR}/matahari-vios-proxy-host.service)
Show replies by date