diff options
| -rw-r--r-- | Makefile.build | 10 | ||||
| -rw-r--r-- | scripts/coqmktop.ml | 3 |
2 files changed, 7 insertions, 6 deletions
diff --git a/Makefile.build b/Makefile.build index 829a4b6614..cbb2d3fe84 100644 --- a/Makefile.build +++ b/Makefile.build @@ -664,17 +664,17 @@ install-library: $(MKDIR) $(FULLCOQLIB)/states $(INSTALLLIB) states/*.coq $(FULLCOQLIB)/states $(MKDIR) $(FULLCOQLIB)/user-contrib - cp --parents $(LINKCMO) $(GRAMMARCMA) $(FULLCOQLIB) + $(INSTALLLIB) $(DLLCOQRUN) $(FULLCOQLIB) + cp --parents $(CONFIG) $(LINKCMO) $(GRAMMARCMA) $(FULLCOQLIB) + cp --parents $(OBJSCMO:.cmo=.cmi) $(FULLCOQLIB) ifeq ($(BEST),opt) - cp --parents $(LINKCMX) $(FULLCOQLIB) + $(INSTALLLIB) $(LIBCOQRUN) $(FULLCOQLIB) + cp --parents $(CONFIG:.cmo=.cmx) $(CONFIG:.cmo=.o) $(LINKCMO:.cma=.cmxa) $(LINKCMO:.cma=.a) $(FULLCOQLIB) endif - find . $(FIND_VCS_CLAUSE) \( -name \*.o -o -name \*.a -o -name \*.cmxs \) -exec cp --parents {} $(FULLCOQLIB) \; - find . $(FIND_VCS_CLAUSE) -name \*.cmi -exec cp --parents {} $(FULLCOQLIB) \; # csdpcert is not meant to be directly called by the user; we install # it with libraries -$(MKDIR) -p $(FULLCOQLIB)/contrib/micromega $(INSTALLBIN) $(CSDPCERT) $(FULLCOQLIB)/contrib/micromega - $(INSTALLLIB) $(DLLCOQRUN) $(FULLCOQLIB) install-library-light: $(MKDIR) $(FULLCOQLIB) diff --git a/scripts/coqmktop.ml b/scripts/coqmktop.ml index 0bd9d0402b..b765f8620b 100644 --- a/scripts/coqmktop.ml +++ b/scripts/coqmktop.ml @@ -57,10 +57,11 @@ let src_dirs () = let includes () = let coqlib = Envars.coqlib () in + let camlp4lib = Envars.camlp4lib () in List.fold_right (fun d l -> "-I" :: List.fold_left Filename.concat coqlib d :: l) (src_dirs ()) - (["-I"; "\"" ^ Coq_config.camlp4lib ^ "\""] @ + (["-I"; "\"" ^ camlp4lib ^ "\""] @ ["-I"; "\"" ^ coqlib ^ "\""] @ (if !coqide then ["-thread"; "-I"; "+lablgtk2"] else [])) |