Build fixes for *NIX.

diff --git a/.gitignore b/.gitignore
index 90f7a7aa71cfbdf90620cefd64ca8cefd6170dc8..b00ac47b6d230341bf9638b7c8a0dc3cc4556e35 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -34,4 +34,4 @@ ltmain.sh
 missing
 stamp-h1
 .libs
-icinga/icinga
\ No newline at end of file
+icinga-app/icinga

diff --git a/configrpccomponent/Makefile.am b/configrpccomponent/Makefile.am
index ee488b9fb96c3f38ee62e1dec5b1b059ec8d0d37..712ea778fdcae68157d954b822e7cae15ec613fa 100644 (file)
--- a/configrpccomponent/Makefile.am
+++ b/configrpccomponent/Makefile.am
@@ -11,10 +11,10 @@ configrpccomponent_la_SOURCES =  \
 configrpccomponent_la_CXXFLAGS = -I${top_srcdir}/base \
        -I${top_srcdir}/jsonrpc \
        -I${top_srcdir}/cJSON \
-       -I${top_srcdir}/libicinga
+       -I${top_srcdir}/icinga
 
 configrpccomponent_la_LDFLAGS = -module -version-info 0:0:0 -no-undefined -pthread
 configrpccomponent_la_LIBADD = ${top_builddir}/base/libbase.la \
        ${top_builddir}/jsonrpc/libjsonrpc.la \
        ${top_builddir}/cJSON/libcJSON.la \
-       ${top_builddir}/libicinga/libicinga.la
+       ${top_builddir}/icinga/libicinga.la

diff --git a/icinga-app/Makefile.am b/icinga-app/Makefile.am
index 3f5640cc7efed42eaf288381f56e9b8bed7d6386..e2233e971e4f6fab7665225610443a25ec240796 100644 (file)
--- a/icinga-app/Makefile.am
+++ b/icinga-app/Makefile.am
@@ -12,10 +12,10 @@ icinga_CFLAGS = -DI2_ICINGALAUNCHER_BUILD
 icinga_CXXFLAGS = -DI2_ICINGALAUNCHER_BUILD -I${top_srcdir}/base \
        -I${top_srcdir}/jsonrpc \
        -I${top_srcdir}/cJSON \
-       -I${top_srcdir}/libicinga \
+       -I${top_srcdir}/icinga \
        -I${top_srcdir}
 
-icinga_LDFLAGS = $(top_builddir)/libicinga/libicinga.la \
+icinga_LDFLAGS = $(top_builddir)/icinga/libicinga.la \
        $(top_builddir)/jsonrpc/libjsonrpc.la \
        $(top_builddir)/base/libbase.la \
        ${top_builddir}/cJSON/libcJSON.la