Add the new docs to the 'all' target

diff --git a/pdns/docs/Makefile b/pdns/docs/Makefile
index a672cf9a31252fba7b4f0a89b5a0fc2646e6d64b..8f90c9d5bdf5cb9d47cd847996b9bb44ab614179 100644 (file)
--- a/pdns/docs/Makefile
+++ b/pdns/docs/Makefile
@@ -6,8 +6,7 @@ pdns-expanded.xml: pdns.xml
        ./expand < $< > $@
 
 clean:
-<<<<<<< HEAD
-       rm -rf *.dvi *.pdf *.tex *.toc *.aux *.ps *.bak *.tmp *~ *.log pdns.txt html.tar.bz2 html pdns pdns-expanded.html pdns-expanded.xml pdns_recursor.1 rec_control.1 html-new doc-build
+       rm -rf *.dvi *.pdf *.tex *.toc *.aux *.ps *.bak *.tmp *~ *.log pdns.txt html.tar.bz2 html pdns pdns-expanded.html pdns-expanded.xml pdns_recursor.1 rec_control.1 html-new/index.html
 
 manpages: dnsdist.1 pdns_recursor.1 rec_control.1 dnstcpbench.1