Ocamlbuild: improvements suggested by N. Pouillard

 * Import of Coq_config via myocamlbuild_config.ml, instead of my get_env
 * As a consequence, we enrich this Coq_config with stuff that was
   only in config/Makefile
 * replace the big ugly find by some dependencies against source files
 * by the way: build csdpcert, with the right aliases.

I've tried to escape things properly for windows in ./configure,
but this isn't fully tested yet.

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

1 files changed, 7 insertions, 1 deletions

diff --git a/build b/build
index 4552d5a43..26237b705 100755
--- a/build
+++ b/build
@@ -3,14 +3,20 @@
 FLAGS=
 OCAMLBUILD=ocamlbuild
 
+check_config() {
+ [ -f config/coq_config.ml ] || (echo "please run ./configure first"; exit 1)
+ [ -L myocamlbuild_config.ml ] || ln -sf config/coq_config.ml myocamlbuild_config.ml
+}
+
 ocb()
 {
+  check_config
   $OCAMLBUILD $FLAGS $*
 }
 
 rule() {
   case $1 in
-    clean)  ocb -clean && rm -rf bin/*;;
+    clean)  ocb -clean && rm -rf bin/* && rm -f myocamlbuild_config.ml;;
     all)    ocb coq.otarget;;
     *)      ocb $1;;
   esac;