projects / packages / coq.git / blame
| Commit | Line | Data |
|---|---|---|
| 672cbc20 JB |
1 | --- coq-8.15.0/Makefile.install.orig 2022-01-13 12:55:53.000000000 +0100 |
| 2 | +++ coq-8.15.0/Makefile.install 2022-01-28 18:43:46.051635360 +0100 | |
| 3 | @@ -55,12 +55,12 @@ endif | |
| 4 | # For now, we respect the values given at configure's time. | |
| 5 | ifdef DUNE_29_PLUS | |
| 6 | install-dune: $(BCONTEXT)/coq-core.install $(BCONTEXT)/coqide-server.install | |
| 7 | - dune install $(_DOPT) $(DESTDIRARG) --mandir="$(MANDIR)" --prefix="$(COQPREFIX)" --etcdir="$(CONFIGDIR)" --docdir="$(DOCDIR)" coq-core | |
| 8 | - dune install $(_DOPT) $(DESTDIRARG) --mandir="$(MANDIR)" --prefix="$(COQPREFIX)" --etcdir="$(CONFIGDIR)" --docdir="$(DOCDIR)" coqide-server | |
| 9 | + dune install $(_DOPT) $(DESTDIRARG) --mandir="$(MANDIR)" --etcdir="$(CONFIGDIR)" --docdir="$(DOCDIR)" coq-core | |
| 10 | + dune install $(_DOPT) $(DESTDIRARG) --mandir="$(MANDIR)" --etcdir="$(CONFIGDIR)" --docdir="$(DOCDIR)" coqide-server | |
| 11 | else | |
| 12 | install-dune: $(BCONTEXT)/coq-core.install $(BCONTEXT)/coqide-server.install | |
| 13 | - dune install $(_DOPT) $(DESTDIRARG) --mandir="$(MANDIR)" --prefix="$(COQPREFIX)" coq-core | |
| 14 | - dune install $(_DOPT) $(DESTDIRARG) --mandir="$(MANDIR)" --prefix="$(COQPREFIX)" coqide-server | |
| 15 | + dune install $(_DOPT) $(DESTDIRARG) --mandir="$(MANDIR)" coq-core | |
| 16 | + dune install $(_DOPT) $(DESTDIRARG) --mandir="$(MANDIR)" coqide-server | |
| 17 | endif | |
| 18 | ||
| 19 | # IMPORTANT NOTE: before Dune 2.9, the --docdir and --etcdir options | |
| 20 | @@ -103,9 +103,9 @@ install-coqide: | |
| 21 | else | |
| 22 | ifdef DUNE_29_PLUS | |
| 23 | install-coqide: $(BCONTEXT)/coqide.install | |
| 24 | - dune install $(_DOPT) $(DESTDIRARG) --mandir="$(MANDIR)" --prefix="$(COQPREFIX)" --etcdir="$(CONFIGDIR)" --docdir="$(DOCDIR)" coqide | |
| 25 | + dune install $(_DOPT) $(DESTDIRARG) --mandir="$(MANDIR)" --etcdir="$(CONFIGDIR)" --docdir="$(DOCDIR)" coqide | |
| 26 | else | |
| 27 | - dune install $(_DOPT) $(DESTDIRARG) --mandir="$(MANDIR)" --prefix="$(COQPREFIX)" coqide | |
| 28 | + dune install $(_DOPT) $(DESTDIRARG) --mandir="$(MANDIR)" coqide | |
| 29 | endif | |
| 30 | endif | |
| 31 | ||
| 32 | --- coq-8.15.0/boot/env.ml.orig 2022-01-13 12:55:53.000000000 +0100 | |
| 33 | +++ coq-8.15.0/boot/env.ml 2022-01-29 08:35:32.771267459 +0100 | |
| 34 | @@ -48,7 +48,7 @@ let guess_coqlib () = | |
| 35 | let guess_coqcorelib lib = | |
| 36 | if Sys.file_exists (Path.relative lib "plugins") | |
| 37 | then lib | |
| 38 | - else Path.relative lib "../coq-core" | |
| 39 | + else Path.relative lib "../ocaml/coq-core" | |
| 40 | ||
| 41 | (* Should we fail on double initialization? That seems a way to avoid | |
| 42 | mis-use for example when we pass command line arguments *) |