PATCH: [3.1.6-pws-3] make distclean behavior more appropriate to task

PATCH: [3.1.6-pws-3] make distclean behavior more appropriate to task

[Clint Adams]

--- zsh-3.1.6.pws3.orig/Makefile.in
+++ zsh-3.1.6.pws3/Makefile.in
@@ -96,7 +96,9 @@
 @CLEAN_MK@
 
 distclean-here:
-	rm -f Makefile config.h config.status config.log config.cache stamp-h
+	@cd Completion && $(MAKE) $(MAKEDEFS) $@
+	@cd Functions && $(MAKE) $(MAKEDEFS) $@
+	rm -f Makefile config.h config.status config.log config.cache stamp-h Config/defs.mk
 
 realclean-here:
 	cd $(sdir) && rm -f config.h.in stamp-h.in configure
--- zsh-3.1.6.pws3.orig/Completion/Makefile.in
+++ zsh-3.1.6.pws3/Completion/Makefile.in
@@ -52,13 +52,14 @@
 
 # ========== DEPENDENCIES FOR CLEANUP ==========
 
-@CLEAN_MK@
-
 mostlyclean-here:
 
 distclean-here:
+	rm -f Makefile
 
 realclean-here:
+
+@CLEAN_MK@
 
 # ========== DEPENDENCIES FOR MAINTENANCE ==========
 
--- zsh-3.1.6.pws3.orig/Doc/Makefile.in
+++ zsh-3.1.6.pws3/Doc/Makefile.in
@@ -205,18 +205,18 @@
 
 # ========== DEPENDENCIES FOR CLEANUP ==========
 
-@CLEAN_MK@
-
 clean-here:
 	rm -f *.html *.info* *.dvi *.ps
 	rm -f *.aux *.cp *.cps *.fn *.fns *.ky *.log
 	rm -f *.pg *.pgs *.toc *.tp *.tps *.vr *.vrs
 
-distclean-here:
-	rm -f Makefile
+distclean-here: clean-here
+	rm -f Makefile *.1 *.texi
 
-realclean-here:
-	cd $(sdir) && rm -f version.yo *.1 *.texi ../META-FAQ
+realclean-here: distclean-here
+	cd $(sdir) && rm -f version.yo ../META-FAQ
+
+@CLEAN_MK@
 
 # ========== DEPENDENCIES FOR MAINTENANCE ==========
 
--- zsh-3.1.6.pws3.orig/Functions/Makefile.in
+++ zsh-3.1.6.pws3/Functions/Makefile.in
@@ -52,13 +52,14 @@
 
 # ========== DEPENDENCIES FOR CLEANUP ==========
 
-@CLEAN_MK@
-
 mostlyclean-here:
 
 distclean-here:
+	rm -f Makefile
 
 realclean-here:
+
+@CLEAN_MK@
 
 # ========== DEPENDENCIES FOR MAINTENANCE ==========