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 57c28dc4523ba97f87e0aa8711a5a93ae2cc8ca8..742e3293009027efa7cd7e7d9517ef985b537493 100644 (file)
--- 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 18ad53edfbf4ac3631ba68c9abd2b7b2ea0ca7ad..33c1f586aa6b52c72ff41d67bcdadd9c6ca5e229 100644 (file)
--- 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