tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Gunnar Beutner 2012-09-17 09:48:34 +02:00
parent 0884a67ebe
commit 093931a1d3
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
icinga-app/Makefile.am
View File

@ -4,12 +4,12 @@ SUBDIRS = \
config config
bin_PROGRAMS = \ bin_PROGRAMS = \
icinga icinga2
icinga_SOURCES = \ icinga2_SOURCES = \
icinga.cpp icinga.cpp
icinga_CPPFLAGS = \ icinga2_CPPFLAGS = \
-DI2_ICINGALAUNCHER_BUILD \ -DI2_ICINGALAUNCHER_BUILD \
$(LTDLINCL) \ $(LTDLINCL) \
$(BOOST_CPPFLAGS) \ $(BOOST_CPPFLAGS) \
@ -19,10 +19,10 @@ icinga_CPPFLAGS = \
-I${top_srcdir}/lib/icinga \ -I${top_srcdir}/lib/icinga \
-I${top_srcdir} -I${top_srcdir}
icinga_LDFLAGS = \ icinga2_LDFLAGS = \
$(BOOST_LDFLAGS) $(BOOST_LDFLAGS)
icinga_LDADD = \ icinga2_LDADD = \
$(LIBLTDL) \ $(LIBLTDL) \
$(BOOST_SIGNALS_LIB) \ $(BOOST_SIGNALS_LIB) \
$(BOOST_THREAD_LIB) \ $(BOOST_THREAD_LIB) \
@ -38,6 +38,6 @@ icinga_LDADD = \
-dlopen ${top_builddir}/components/delegation/delegation.la \ -dlopen ${top_builddir}/components/delegation/delegation.la \
-dlopen ${top_builddir}/components/demo/demo.la -dlopen ${top_builddir}/components/demo/demo.la
icinga_DEPENDENCIES = \ icinga2_DEPENDENCIES = \
${top_builddir}/components/replication/replication.la \ ${top_builddir}/components/replication/replication.la \
${top_builddir}/components/convenience/convenience.la ${top_builddir}/components/convenience/convenience.la

2
icinga2.spec
View File

@ -33,7 +33,7 @@ make install DESTDIR=%{buildroot}
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%{_bindir}/icinga %{_bindir}/icinga2
%{_datadir}/doc/icinga2 %{_datadir}/doc/icinga2
%{_libdir}/icinga2 %{_libdir}/icinga2
%{_sysconfdir}/icinga2 %{_sysconfdir}/icinga2