Make sure that 'make distclean' cleans out all files that are not meant

to be shipped.  Also, allow 'make clean' to remove intermediate working files.

diff --git a/doc/src/sgml/Makefile b/doc/src/sgml/Makefile
index 25ca1c1..ee6e4be 100644 (file)
--- a/doc/src/sgml/Makefile
+++ b/doc/src/sgml/Makefile
@@ -2,7 +2,7 @@
 #
 # PostgreSQL documentation makefile
 #
-# $PostgreSQL: pgsql/doc/src/sgml/Makefile,v 1.125 2009/08/11 22:21:51 petere Exp $
+# $PostgreSQL: pgsql/doc/src/sgml/Makefile,v 1.126 2009/08/15 01:56:35 tgl Exp $
 #
 #----------------------------------------------------------------------------
 
@@ -178,8 +178,6 @@ postgres.pdf:
        pdfjadetex $<
        pdfjadetex $<
 
-.PRECIOUS: %-A4.tex-ps %-US.tex-ps %-A4.tex-pdf %-US.tex-pdf
-
 # Cancel built-in suffix rules, interfering with PS building
 .SUFFIXES:
 
@@ -357,22 +355,28 @@ endif # sqlmansectnum != 7
 # This allows removing some files from the distribution tarballs while
 # keeping the dependencies satisfied.
 .SECONDARY: postgres.xml $(GENERATED_SGML) HTML.index
+.SECONDARY: INSTALL.html HISTORY.html regress_README.html
+.SECONDARY: %-A4.tex-ps %-US.tex-ps %-A4.tex-pdf %-US.tex-pdf
 
-distclean:
+clean:
        rm -f postgres.xml $(GENERATED_SGML) HTML.index
+       rm -f INSTALL.html HISTORY.html regress_README.html
+       rm -f $(addprefix $(srcdir)/,*.tex-ps *.tex-pdf *.dvi *.aux *.log *.out *.fot)
 
-maintainer-clean: distclean
-# HTML
-       rm -rf $(addprefix $(srcdir)/,html/ html-stamp)
-# man
-       rm -rf $(addprefix $(srcdir)/,man1/ man3/ man7/ man-stamp)
+distclean: clean
+# text --- these are shipped, but not in this directory
+       rm -f $(addprefix $(srcdir)/,INSTALL HISTORY regress_README)
 # print
-       rm -f $(addprefix $(srcdir)/,*.rtf *.tex-ps *.tex-pdf *.dvi *.aux *.log *.ps *.pdf *.out *.fot)
+       rm -f $(addprefix $(srcdir)/,*.rtf *.ps *.pdf)
 # index
        rm -f $(addprefix $(srcdir)/,HTML.index $(GENERATED_SGML))
-# text
-       rm -f $(addprefix $(srcdir)/,INSTALL HISTORY regress_README)
 # XSLT
        rm -f $(addprefix $(srcdir)/,htmlhelp.hhp toc.hhc index.hhk *.fo)
 # Texinfo
        rm -f $(addprefix $(srcdir)/,*.texixml *.texi *.info db2texi.refs)
+
+maintainer-clean: distclean
+# HTML
+       rm -rf $(addprefix $(srcdir)/,html/ html-stamp)
+# man
+       rm -rf $(addprefix $(srcdir)/,man1/ man3/ man7/ man-stamp)