Merge PR #9622: Fix makefile deps for coqide

Ack-by: SkySkimmer
Reviewed-by: ppedrot

3 files changed, 5 insertions, 5 deletions

diff --git a/Makefile.ide b/Makefile.ide
index 23ce83d263..db1cc3746d 100644
--- a/Makefile.ide
+++ b/Makefile.ide
@@ -70,7 +70,7 @@ SOURCEVIEWSHARE=$(shell pkg-config --variable=prefix gtksourceview-2.0)/share
 .PHONY: ide-toploop ide-byteloop ide-optloop
 
 # target to build CoqIde (native version) and the stuff needed to lauch it
-coqide: coqide-files coqide-opt theories/Init/Prelude.$(VO)
+coqide: coqide-files coqide-opt theories/Init/Prelude.$(VO) $(TOPBIN)
 
 # target to build CoqIde (in native and byte versions), and no more
 # NB: this target is used in the opam package coq-coqide
diff --git a/ide/coq.ml b/ide/coq.ml
index 91cd448eda..e7eea4ced2 100644
--- a/ide/coq.ml
+++ b/ide/coq.ml
@@ -119,7 +119,7 @@ let rec filter_coq_opts args =
 
 and asks_for_coqtop args =
   let pb_mes = GWindow.message_dialog
-    ~message:"Failed to load coqtop. Reset the preference to default ?"
+    ~message:"Failed to load coqidetop. Reset the preference to default ?"
     ~message_type:`QUESTION ~buttons:GWindow.Buttons.yes_no () in
   match pb_mes#run () with
     | `YES ->
@@ -130,7 +130,7 @@ and asks_for_coqtop args =
     | `DELETE_EVENT | `NO ->
       let () = pb_mes#destroy () in
       let cmd_sel = GWindow.file_selection
-	~title:"Coqtop to execute (edit your preference then)"
+        ~title:"coqidetop to execute (edit your preference then)"
 	~filename:(coqtop_path ()) ~urgency_hint:true () in
       match cmd_sel#run () with
 	| `OK ->
@@ -419,7 +419,7 @@ let rec respawn_coqtop ?(why=Unexpected) coqtop =
     let title = "Warning" in
     let icon = (warn_image ())#coerce in
     let buttons = ["Reset"; "Save all and quit"; "Quit without saving"] in
-    let ans = GToolbox.question_box ~title ~buttons ~icon "Coqtop died badly." in
+    let ans = GToolbox.question_box ~title ~buttons ~icon "coqidetop died badly." in
     if ans = 2 then (!save_all (); GtkMain.Main.quit ())
     else if ans = 3 then GtkMain.Main.quit ()
   | Planned -> ()
diff --git a/ide/preferences.ml b/ide/preferences.ml
index 4aa8c92f73..1fdf54d4d1 100644
--- a/ide/preferences.ml
+++ b/ide/preferences.ml
@@ -692,7 +692,7 @@ let configure ?(apply=(fun () -> ())) parent =
   let cmd_coqtop =
     string
       ~f:(fun s -> cmd_coqtop#set (if s = "AUTO" then None else Some s))
-      "       coqtop" (match cmd_coqtop#get with |None -> "AUTO" | Some x -> x) in
+      "    coqidetop" (match cmd_coqtop#get with |None -> "AUTO" | Some x -> x) in
   let cmd_coqc = pstring "       coqc" cmd_coqc in
   let cmd_make = pstring "       make" cmd_make in
   let cmd_coqmakefile = pstring "coqmakefile" cmd_coqmakefile in