From: Pieter Lexis <pieter@plexis.eu>
Date: Tue, 26 Aug 2014 12:59:09 +0000 (+0200)
Subject: Add the new docs to the 'all' target
X-Git-Tag: rec-3.7.0-rc1~161^2^2~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a21ef9e4650575b757dfb6f2939e6aba8c3cfeb1;p=thirdparty%2Fpdns.git

Add the new docs to the 'all' target
---

diff --git a/pdns/docs/Makefile b/pdns/docs/Makefile
index a672cf9a31..8f90c9d5bd 100644
--- 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