Fix the clean rule to never remove generated doc files

... this is now done by new distclean rule, which will also
purge autoconf files.

diff --git a/.gitignore b/.gitignore
index a49c82bba17660b781fd390d6117e73b26fa954c..5a360a8d7cd031fecb64914404ae36c58fb81868 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+aclocal.m4

 autom4te.cache
 config.h
 config.h.in
 autom4te.cache
 config.h
 config.h.in

diff --git a/Makefile b/Makefile
index 5bf60e33c13147d04e33ca9bb634bcd6df190136..6f23166b6a99df2708ed1376c7abcfbf6b546628 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -81,9 +81,12 @@ install-doc-html: doc-html
 install-doc: install-doc-man install-doc-html
 
 clean:
 install-doc: install-doc-man install-doc-html
 
 clean:

-       rm -rf manual.html-chunked $(TARNAME)
-       rm -f $(PROGS) $(ALLDOC) core *.o *.xml *.toc
-       rm -f *.spec tig-*.tar.gz tig-*.tar.gz.md5
+       $(RM) -r $(TARNAME) *.spec tig-*.tar.gz tig-*.tar.gz.md5
+       $(RM) $(PROGS) core *.o *.xml
+
+distclean: clean
+       $(RM) -r manual.html-chunked *.toc $(ALLDOC)
+       $(RM) -r autom4te.cache aclocal.m4 config.{h,log,make,status} config.h.in configure

 
 spell-check:
        aspell --lang=en --check tig.1.txt tigrc.5.txt manual.txt
 
 spell-check:
        aspell --lang=en --check tig.1.txt tigrc.5.txt manual.txt


@@ -112,7 +115,7 @@ configure: configure.ac acinclude.m4
 release-doc:
        git checkout release && \
        git merge master && \
 release-doc:
        git checkout release && \
        git merge master && \

-       $(MAKE) clean doc-man doc-html && \
+       $(MAKE) distclean doc-man doc-html && \

        git add -f $(MANDOC) $(HTMLDOC) && \
        git commit -m "Sync docs" && \
        git checkout master
        git add -f $(MANDOC) $(HTMLDOC) && \
        git commit -m "Sync docs" && \
        git checkout master