From bd7f800d5fc48dcb7bfae475e796f6e18901fbcb Mon Sep 17 00:00:00 2001
From: glondu
Date: Sun, 7 Sep 2008 22:28:04 +0000
Subject: Commit fixes from v8.2 branch (r11386 and r11387)

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@11390 85f007b7-540e-0410-9357-904b9bb8a0f7
---
 Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 5d310b6585..88151284da 100644
--- a/Makefile
+++ b/Makefile
@@ -24,14 +24,14 @@
 # by Emacs' next-error.
 ###########################################################################
 
-FIND_VCS_CLAUSE:='(' \
+export FIND_VCS_CLAUSE:='(' \
   -name '{arch}' -or \
   -name '.svn' -or \
   -name '_darcs' -or \
   -name '.git' -or \
   -name 'debian' -or \
   -name "$${GIT_DIR}" \
-')' -prune -or
+')' -prune -type f -or
 FIND_PRINTF_P:=-print | sed 's|^\./||'
 
 export YACCFILES:=$(shell find . $(FIND_VCS_CLAUSE) '(' -name '*.mly' ')' $(FIND_PRINTF_P))
@@ -155,7 +155,7 @@ cruftclean: ml4clean
 
 indepclean:
 	rm -f $(GENFILES)
-	rm -f $(COQTOPBYTE) $(COQCBYTE) $(CHICKENBYTE)
+	rm -f $(COQTOPBYTE) $(COQMKTOPBYTE) $(COQCBYTE) $(CHICKENBYTE)
 	rm -f bin/coq-interface$(EXE) bin/coq-parser$(EXE)
 	find . -name '*~' -or -name '*.cm[ioa]' | xargs rm -f
 	find contrib test-suite -name '*.vo' -or -name '*.glob' | xargs rm -f
@@ -203,7 +203,7 @@ ml4depclean:
 	find . -name '*.ml4.d' | xargs rm -f
 
 depclean:
-	find . -name '*.d' | xargs rm -f
+	find . $(FIND_VCS_CLAUSE) -name '*.d' | xargs rm -f
 
 cleanconfig:
 	rm -f config/Makefile config/coq_config.ml dev/ocamldebug-v7 ide/undo.mli
-- 
cgit v1.2.3