From: Badlop <badlop@process-one.net>
Date: Sat, 21 Feb 2009 09:24:57 +0000 (+0000)
Subject: Merge r1862 from trunk:
X-Git-Tag: v2.0.5~33
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=02d7d0aa4c0595df1b0b298b9dcd4134a7842ff2;p=ejabberd

Merge r1862 from trunk:

* doc/Makefile: In Clean do not remove html. In new Distclean, remove also html.

SVN Revision: 1901
---

diff --git a/ChangeLog b/ChangeLog
index 57c28dc45..742e32930 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2009-02-21  Badlop  <badlop@process-one.net>
 
+ 	* doc/Makefile: In Clean do not remove html. In new Distclean,
+	remove also html.
+
  	* doc/Makefile: When cleaning, remove contributed_modules.tex
 
  	* doc/guide.tex: Provide only an example of language option
diff --git a/doc/Makefile b/doc/Makefile
index 18ad53edf..33c1f586a 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -32,7 +32,6 @@ pdf:	guide.pdf features.pdf
 clean:
 	rm -f *.aux
 	rm -f *.haux
-	rm -f *.html
 	rm -f *.htoc
 	rm -f *.idx
 	rm -f *.ilg
@@ -41,7 +40,10 @@ clean:
 	rm -f *.out
 	rm -f *.pdf
 	rm -f *.toc
-	rm contributed_modules.tex
+	[ ! -f contributed_modules.tex ] || rm contributed_modules.tex
+
+distclean: clean
+	rm -f *.html
 
 guide.html:	guide.tex
 		hevea -fix -pedantic guide.tex