Renamed icinga binary to icinga2 to avoid conflicts with Icinga 1.x

diff --git a/icinga-app/Makefile.am b/icinga-app/Makefile.am
index e5fc0887dabd50fbf561fba82df00f3f380e9ae9..3f7e5a68ccc11ceaeccf1f9516600588604b6826 100644 (file)
--- 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 1ba401330eca3cb5cf3eef41cb4528c6d0f15f0d..039ff41aaf8f73bb9a8eabdf5652883cef815359 100644 (file)
--- 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