Merge branch 'v8.5'

2 files changed, 4 insertions, 6 deletions

diff --git a/tools/coq_makefile.ml b/tools/coq_makefile.ml
index b5d0d22819..11b4b37326 100644
--- a/tools/coq_makefile.ml
+++ b/tools/coq_makefile.ml
@@ -299,7 +299,7 @@ let install (vfiles,(mlifiles,ml4files,mlfiles,mllibfiles,mlpackfiles),_,sds) in
       printf "find %s/%s -maxdepth 0 -and -empty -exec rmdir -p \\{\\} \\;\\n' >> \"$@\"\n" dir kind
     in
     printf "uninstall_me.sh: %s\n" !makefile_name;
-    print "\techo '#!/bin/sh' > $@ \n";
+    print "\techo '#!/bin/sh' > $@\n";
     if (not_empty cmxsfiles) then uninstall_by_root where_what_cmxs;
     uninstall_by_root where_what_oth;
     if not_empty vfiles then uninstall_one_kind "html" doc_dir;
@@ -496,7 +496,7 @@ endif\n";
           print "\n"
 
 let parameters () =
-  print ".DEFAULT_GOAL := all\n\n# \n";
+  print ".DEFAULT_GOAL := all\n\n";
   print "# This Makefile may take arguments passed as environment variables:\n";
   print "# COQBIN to specify the directory where Coq binaries resides;\n";
   print "# TIMECMD set a command to log .v compilation time;\n";
diff --git a/tools/coqdep_common.ml b/tools/coqdep_common.ml
index 7d8199ab38..9b7845b09e 100644
--- a/tools/coqdep_common.ml
+++ b/tools/coqdep_common.ml
@@ -122,10 +122,8 @@ let error_cannot_parse s (i,j) =
   exit 1
 
 let warning_module_notfound f s =
-  eprintf "*** Warning: in file %s, library " f;
-  eprintf "%s.v is required and has not been found in the loadpath!\n"
-    (String.concat "." s);
-  flush stderr
+  eprintf "*** Warning: in file %s, library %s is required and has not been found in the loadpath!\n%!"
+    f (String.concat "." s)
 
 let warning_notfound f s =
   eprintf "*** Warning: in file %s, the file " f;