Fix dnsdist out-of-tree builds

Closes #4866

diff --git a/pdns/dnsdistdist/.gitignore b/pdns/dnsdistdist/.gitignore
index 7f69297382d225a520c9796ad00b4ea51356bc34..0cc6785d1cd4692cf96cdf09f7f66af9b7cd801f 100644 (file)
--- a/pdns/dnsdistdist/.gitignore
+++ b/pdns/dnsdistdist/.gitignore
@@ -23,6 +23,7 @@
 /ext/yahttp/yahttp/Makefile
 /ext/yahttp/yahttp/Makefile.in
 /htmlfiles.h
+/htmlfiles.h.tmp
 /install-sh
 /libtool
 /ltmain.sh

diff --git a/pdns/dnsdistdist/Makefile.am b/pdns/dnsdistdist/Makefile.am
index 5948b1b8d27be4aa946b169829e7664479a2dd99..c4a01202cae4cad6fba63955581a6faf7dd80632 100644 (file)
--- a/pdns/dnsdistdist/Makefile.am
+++ b/pdns/dnsdistdist/Makefile.am
@@ -4,15 +4,16 @@ ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS=ext/yahttp
 
-CLEANFILES = dnsmessage.pb.cc dnsmessage.pb.h
+CLEANFILES = dnsmessage.pb.cc dnsmessage.pb.h htmlfiles.h.tmp htmlfiles.h
 
 dnslabeltext.cc: dnslabeltext.rl
        $(AM_V_GEN)$(RAGEL) $< -o dnslabeltext.cc
 
 BUILT_SOURCES=htmlfiles.h
 
-htmlfiles.h: html/*
-       ./incfiles > $@
+htmlfiles.h: $(srcdir)/html/*
+       $(AM_V_GEN)$(srcdir)/incfiles $(srcdir) > $@.tmp
+       @mv $@.tmp $@
 
 SRC_JS_FILES := $(wildcard src_js/*.js)
 MIN_JS_FILES := $(patsubst src_js/%.js,html/js/%.min.js,$(SRC_JS_FILES))
@@ -134,7 +135,7 @@ endif
 if HAVE_PROTOBUF
 if HAVE_PROTOC
 dnsmessage.pb.cc: dnsmessage.proto
-       $(AM_V_GEN)$(PROTOC) --cpp_out=./ $<
+       $(AM_V_GEN)$(PROTOC) -I$(srcdir) --cpp_out=./ $<
 
 BUILT_SOURCES += dnsmessage.pb.cc