Build system:

 - BSD compatibility: do not use -printf action of find (2nd round)
 - don't recurse into VCS metadata for file lists


git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@10057 85f007b7-540e-0410-9357-904b9bb8a0f7

1 files changed, 9 insertions, 6 deletions

diff --git a/Makefile.common b/Makefile.common
index 0e61012173..f899953a07 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -431,20 +431,23 @@ PRINTERSCMO:=\
   toplevel/cerrors.cmo toplevel/vernacexpr.cmo toplevel/vernacinterp.cmo \
   dev/top_printers.cmo
 
-YACCFILES:= $(shell find . '(' -name '*.mly' ')' -printf '%P\n')
-LEXFILES := $(shell find . '(' -name '*.mll' ')' -printf '%P\n')
+FIND_VCS_CLAUSE:='(' -name '{arch}' -or -name '.svn' -or -name '_darcs' -or -name '.git' -or -name "$${GIT_DIR}" ')' -prune -or
+FIND_PRINTF_P:=| sed 's|^\./||'
+
+YACCFILES:= $(shell find . $(VCS_CLAUSE) '(' -name '*.mly' ')' $(FIND_PRINTF_P))
+LEXFILES := $(shell find . $(VCS_CLAUSE) '(' -name '*.mll' ')' $(FIND_PRINTF_P))
 GENMLFILES:=$(LEXFILES:.mll=.ml) $(YACCFILES:.mly=.ml) \
   scripts/tolink.ml kernel/copcodes.ml
 GENMLIFILES:=$(YACCFILES:.mly=.mli)
 GENHFILES:=kernel/byterun/coq_jumptbl.h
 GENFILES:=$(GENMLFILES) $(GENMLIFILES) $(GENHFILES)
-MLFILES  := $(shell find . '(' -name '*.ml'  ')' | sed 's|^\./||' | \
+MLFILES  := $(shell find . $(VCS_CLAUSE) '(' -name '*.ml'  ')' $(FIND_PRINTF_P) | \
   while read f; do if ! [ -e "$${f}4" ]; then echo "$$f"; fi; done) \
   $(GENMLFILES)
-MLIFILES := $(shell find . '(' -name '*.mli' ')' | sed 's|^\./||') \
+MLIFILES := $(shell find . $(VCS_CLAUSE) '(' -name '*.mli' ')' $(FIND_PRINTF_P)) \
   $(GENMLIFILES)
-ML4FILES := $(shell find . '(' -name '*.ml4' ')' | sed 's|^\./||')
-VFILES   := $(shell find . '(' -name '*.v'   ')' | sed 's|^\./||')
+ML4FILES := $(shell find . $(VCS_CLAUSE) '(' -name '*.ml4' ')' $(FIND_PRINTF_P))
+VFILES   := $(shell find . $(VCS_CLAUSE) '(' -name '*.v'   ')' $(FIND_PRINTF_P))
 CFILES   := $(shell find kernel/byterun -name '*.c')
 
 ML4FILESML:= $(ML4FILES:.ml4=.ml)