From f1f56d9f8ea26b74227bf381ce581c9aadf75c27 Mon Sep 17 00:00:00 2001
From: lmamane
Date: Wed, 11 Feb 2009 09:14:20 +0000
Subject: Convert all uses of FIND_VCS_CLAUSE to recommended style (which
 allows to get rid of '-type f' hack)

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@11908 85f007b7-540e-0410-9357-904b9bb8a0f7
---
 Makefile       | 6 +++---
 Makefile.build | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 3aa0be7296..1278e475be 100644
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,7 @@ export FIND_VCS_CLAUSE:='(' \
   -name '.git' -or \
   -name 'debian' -or \
   -name "$${GIT_DIR}" \
-')' -prune -type f -or
+')' -prune -or
 export PRUNE_CHECKER := -wholename ./checker/\* -prune -or
 
 FIND_PRINTF_P:=-print | sed 's|^\./||'
@@ -52,7 +52,7 @@ export MLIFILES := $(shell find . $(FIND_VCS_CLAUSE) '(' -name '*.mli' ')' $(FIN
 export ML4FILES := $(shell find . $(FIND_VCS_CLAUSE) '(' -name '*.ml4' ')' $(FIND_PRINTF_P))
 #export VFILES   := $(shell find . $(FIND_VCS_CLAUSE) '(' -name '*.v'   ')' $(FIND_PRINTF_P)) \
 #  $(GENVFILES)
-export CFILES   := $(shell find kernel/byterun $(FIND_VCS_CLAUSE) -name '*.c')
+export CFILES   := $(shell find kernel/byterun $(FIND_VCS_CLAUSE) '(' -name '*.c' ')' -print)
 
 export ML4FILESML:= $(ML4FILES:.ml4=.ml)
 
@@ -205,7 +205,7 @@ ml4depclean:
 	find . -name '*.ml4.d' | xargs rm -f
 
 depclean:
-	find . $(FIND_VCS_CLAUSE) -name '*.d' | xargs rm -f
+	find . $(FIND_VCS_CLAUSE) '(' -name '*.d' ')' -print | xargs rm -f
 
 cleanconfig:
 	rm -f config/Makefile config/coq_config.ml dev/ocamldebug-v7 ide/undo.mli config/revision.ml
diff --git a/Makefile.build b/Makefile.build
index d7957bde85..562228f853 100644
--- a/Makefile.build
+++ b/Makefile.build
@@ -714,7 +714,7 @@ install-latex:
 source-doc:
 	if !(test -d $(SOURCEDOCDIR)); then mkdir $(SOURCEDOCDIR); fi
 	$(OCAMLDOC) -html -rectypes $(LOCALINCLUDES) -d $(SOURCEDOCDIR) \
-	  `find . $(FIND_VCS_CLAUSE) -name "*.ml"`
+	  `find . $(FIND_VCS_CLAUSE) '(' -name '*.ml' ')' -print`
 
 
 ###########################################################################
-- 
cgit v1.2.3