From 093931a1d3ab14e3aed11184af26b144d328c7b2 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Mon, 17 Sep 2012 09:48:34 +0200 Subject: [PATCH] Renamed icinga binary to icinga2 to avoid conflicts with Icinga 1.x --- icinga-app/Makefile.am | 12 ++++++------ icinga2.spec | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/icinga-app/Makefile.am b/icinga-app/Makefile.am index e5fc0887d..3f7e5a68c 100644 --- a/icinga-app/Makefile.am +++ b/icinga-app/Makefile.am @@ -4,12 +4,12 @@ SUBDIRS = \ config bin_PROGRAMS = \ - icinga + icinga2 -icinga_SOURCES = \ +icinga2_SOURCES = \ icinga.cpp -icinga_CPPFLAGS = \ +icinga2_CPPFLAGS = \ -DI2_ICINGALAUNCHER_BUILD \ $(LTDLINCL) \ $(BOOST_CPPFLAGS) \ @@ -19,10 +19,10 @@ icinga_CPPFLAGS = \ -I${top_srcdir}/lib/icinga \ -I${top_srcdir} -icinga_LDFLAGS = \ +icinga2_LDFLAGS = \ $(BOOST_LDFLAGS) -icinga_LDADD = \ +icinga2_LDADD = \ $(LIBLTDL) \ $(BOOST_SIGNALS_LIB) \ $(BOOST_THREAD_LIB) \ @@ -38,6 +38,6 @@ icinga_LDADD = \ -dlopen ${top_builddir}/components/delegation/delegation.la \ -dlopen ${top_builddir}/components/demo/demo.la -icinga_DEPENDENCIES = \ +icinga2_DEPENDENCIES = \ ${top_builddir}/components/replication/replication.la \ ${top_builddir}/components/convenience/convenience.la diff --git a/icinga2.spec b/icinga2.spec index 1ba401330..039ff41aa 100644 --- a/icinga2.spec +++ b/icinga2.spec @@ -33,7 +33,7 @@ make install DESTDIR=%{buildroot} %files %defattr(-,root,root) -%{_bindir}/icinga +%{_bindir}/icinga2 %{_datadir}/doc/icinga2 %{_libdir}/icinga2 %{_sysconfdir}/icinga2 -- 2.40.0