aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Théo Zimmermann <theo.zimmermann@univ-paris-diderot.fr>2018-06-13 15:30:30 +0200
committerGravatar Théo Zimmermann <theo.zimmermann@univ-paris-diderot.fr>2018-06-13 15:30:30 +0200
commit43d6395232632853ba90e6c4dab512e6a862859e (patch)
treeb7d0fa4eeaac31aeffbad9ea10975df5c769af42
parent3d30f6f2478cfdcacb0c3c56852230499e83aeea (diff)
parent46a9d3a4430dc262f78596b4030d6195194c6aee (diff)
Merge PR #7241: [coq_makefile] COQMF_WINDRIVE is empty on linux (fix #7233)
-rw-r--r--tools/CoqMakefile.in2
-rw-r--r--tools/coq_makefile.ml2
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/CoqMakefile.in b/tools/CoqMakefile.in
index e5f22f25e..8e60d3932 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 =