diff options
| author |  pboutill <pboutill@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2012-12-10 11:19:03 +0000 |
|---|---|---|
| committer | pboutill <pboutill@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2012-12-10 11:19:03 +0000 |
| commit | 6416f0d41e46aaa64af50aa20dfb324db242286a (patch) | |
| tree | 07f4843d89591c6277dc4f8ed2bf7d675f1b8f30 /tools/coq_makefile.ml | |
| parent | bf4b6736570eadad18a3e9ad10a3792c48be7d2c (diff) | |
Coq_makefile: Better rule for subdirs when the subdir does not exist
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@16056 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'tools/coq_makefile.ml')
| -rw-r--r-- | tools/coq_makefile.ml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/coq_makefile.ml b/tools/coq_makefile.ml index e113fbbce..057ac0bce 100644 --- a/tools/coq_makefile.ml +++ b/tools/coq_makefile.ml @@ -249,7 +249,7 @@ let install (vfiles,(mlifiles,ml4files,mlfiles,mllibfiles,mlpackfiles),_,sds) in install_include_by_root where_what_oth; List.iter (fun x -> - printf "\t(cd %s; $(MAKE) DSTROOT=$(DSTROOT) INSTALLDEFAULTROOT=$(INSTALLDEFAULTROOT)/%s install)\n" x x) + printf "\t+cd %s && $(MAKE) DSTROOT=$(DSTROOT) INSTALLDEFAULTROOT=$(INSTALLDEFAULTROOT)/%s install\n" x x) sds; print "\n"; let install_one_kind kind dir = @@ -284,7 +284,7 @@ let make_makefile sds = print "\tmv -f $@ $@.bak\n"; print "\t$(COQBIN)coq_makefile -f $< -o $@\n\n"; List.iter - (fun x -> print "\t(cd "; print x; print " ; $(MAKE) Makefile)\n") + (fun x -> print "\t+cd "; print x; print " && $(MAKE) Makefile\n") sds; print "\n"; end @@ -306,13 +306,13 @@ let clean sds sps = (print "\t- rm -rf "; print file; print "\n")) sps; List.iter - (fun x -> print "\t(cd "; print x; print " ; $(MAKE) clean)\n") + (fun x -> print "\t+cd "; print x; print " && $(MAKE) clean\n") sds; print "\n"; print "archclean:\n"; print "\trm -f *.cmx *.o\n"; List.iter - (fun x -> print "\t(cd "; print x; print " ; $(MAKE) archclean)\n") + (fun x -> print "\t+cd "; print x; print " && $(MAKE) archclean\n") sds; print "\n"; print "printenv:\n\t@$(COQBIN)coqtop -config\n"; @@ -492,7 +492,7 @@ let custom sps = let subdirs sds = let pr_subdir s = - print s; print ":\n\tcd "; print s; print " ; $(MAKE) all\n\n" + print s; print ":\n\t+cd \""; print s; print "\" && $(MAKE) all\n\n" in if sds <> [] then section "Subdirectories."; List.iter pr_subdir sds |