Fix VPATH builds.

diff --git a/configure.ac b/configure.ac
index 729fc62972b6890e880f2c6a6762d30ad5b796de..0bae1f3695cf30e02bd640cbaa939539b027826a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -73,7 +73,7 @@ AC_CHECK_LIB(ws2_32, getsockname)
 AC_CHECK_LIB(shlwapi, PathRemoveFileSpecA)
 AC_CHECK_FUNCS([backtrace_symbols execvpe pipe2])
 
-CFLAGS="$CFLAGS -Wall -Wextra -Weffc++"
+CFLAGS="$CFLAGS -Wall -Wextra"
 CXXFLAGS="$CXXFLAGS -Wall -Wextra -Weffc++"
 
 AC_MSG_CHECKING(whether to enable debugging)

diff --git a/docs/Makefile.am b/docs/Makefile.am
index e9da9bbcb7014aa3dcceddb0304acdf7b884a4d5..78f1742194c4221b9d4815cdc92299fad544e3b6 100644 (file)
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -22,8 +22,8 @@ icinga2doc_DATA += \
        $(AD_ENV) $(AD_ASCIIDOC) -a toc -a numbered $<
 endif AD_COND_doc
 
-icinga2.8: $(top_srcdir)/icinga-app/icinga2
-       -$(HELP2MAN) --name='The Icinga 2 networking monitoring daemon.' --section=8 --no-info --output=$@ $(top_srcdir)/icinga-app/icinga2
+icinga2.8: $(top_builddir)/icinga-app/icinga2
+       -$(HELP2MAN) --name='The Icinga 2 networking monitoring daemon.' --section=8 --no-info --output=$@ $(top_builddir)/icinga-app/icinga2
 
 distclean:
        rm -f $(icinga2doc_DATA)