From 46a9d3a4430dc262f78596b4030d6195194c6aee Mon Sep 17 00:00:00 2001 From: Enrico Tassi Date: Fri, 13 Apr 2018 14:45:13 +0200 Subject: [coq_makefile] COQMF_WINDRIVE is empty on linux (fix #7233) --- tools/CoqMakefile.in | 2 +- tools/coq_makefile.ml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/CoqMakefile.in b/tools/CoqMakefile.in index f6539d80b..017c86c08 100644 --- 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 index 6cd520d60..6f11ee397 100644 --- 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 = -- cgit v1.2.3