Merge PR coq#7241: [coq_makefile] COQMF_WINDRIVE is empty on linux (fix

coq#7233)
validsdp · Jun 13, 2018 · 43d6395 · 43d6395
2 parents 3d30f6f + 46a9d3a
commit 43d6395
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/tools/CoqMakefile.in b/tools/CoqMakefile.in
@@ -227,7 +227,7 @@ ifdef DSTROOT
 DESTDIR := $(DSTROOT)
 endif
 
-concat_path = $(if $(1),$(1)/$(subst $(COQMF_WINDRIVE),/,$(2)),$(2))
+concat_path = $(if $(1),$(1)/$(if $(COQMF_WINDRIVE),$(subst $(COQMF_WINDRIVE),/,$(2)),$(2)),$(2))
 
 COQLIBINSTALL = $(call concat_path,$(DESTDIR),$(COQLIB)user-contrib)
 COQDOCINSTALL = $(call concat_path,$(DESTDIR),$(DOCDIR)user-contrib)

diff --git a/tools/coq_makefile.ml b/tools/coq_makefile.ml
@@ -215,7 +215,7 @@ let generate_conf_includes oc { ml_includes; r_includes; q_includes } =
 let windrive s =
   if Coq_config.arch_is_win32 && Str.(string_match (regexp "^[a-zA-Z]:") s 0)
   then Str.matched_string s
-  else s
+  else ""
 ;;
 
 let generate_conf_coq_config oc args =