From a0d3357f2132e604dfb339d6ddccde441b0d10fc Mon Sep 17 00:00:00 2001 From: Markus Frosch Date: Wed, 14 Jun 2017 15:44:37 +0200 Subject: [PATCH] icinga2.spec: Define ICINGA2_PLUGINDIR only once refs #4721 --- icinga2.spec | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/icinga2.spec b/icinga2.spec index dd36da89e..b36ed8266 100644 --- a/icinga2.spec +++ b/icinga2.spec @@ -304,6 +304,7 @@ CMAKE_OPTS="-DCMAKE_INSTALL_PREFIX=/usr \ -DICINGA2_LTO_BUILD=ON \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DBoost_NO_BOOST_CMAKE=ON \ + -DICINGA2_PLUGINDIR=%{plugindir} \ -DICINGA2_RUNDIR=%{_rundir} \ -DICINGA2_USER=%{icinga_user} \ -DICINGA2_GROUP=%{icinga_group} \ @@ -331,10 +332,7 @@ CMAKE_OPTS="$CMAKE_OPTS \ %endif %endif -%if "%{_vendor}" != "suse" -CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_PLUGINDIR=%{plugindir}" -%else -%if 0%{?suse_version} < 1310 +%if "%{_vendor}" == "suse" && 0%{?suse_version} < 1310 CMAKE_OPTS="$CMAKE_OPTS -DBOOST_LIBRARYDIR=%{_libdir}/boost153 \ -DBOOST_INCLUDEDIR=/usr/include/boost153 \ -DBoost_ADDITIONAL_VERSIONS='1.53;1.53.0' \ @@ -342,8 +340,6 @@ CMAKE_OPTS="$CMAKE_OPTS -DBOOST_LIBRARYDIR=%{_libdir}/boost153 \ -DBUILD_TESTING=FALSE \ -DBoost_NO_BOOST_CMAKE=TRUE" %endif -CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_PLUGINDIR=%{plugindir}" -%endif %if 0%{?use_systemd} CMAKE_OPTS="$CMAKE_OPTS -DUSE_SYSTEMD=ON" -- 2.40.0