aboutsummaryrefslogtreecommitdiff
path: root/tools/CoqMakefile.in
diff options
context:
space:
mode:
Diffstat (limited to 'tools/CoqMakefile.in')
-rw-r--r--tools/CoqMakefile.in9
1 files changed, 6 insertions, 3 deletions
diff --git a/tools/CoqMakefile.in b/tools/CoqMakefile.in
index abfbd66e28..7c53ecfe18 100644
--- a/tools/CoqMakefile.in
+++ b/tools/CoqMakefile.in
@@ -78,6 +78,11 @@ else
STDTIME?=command time -f $(TIMEFMT)
endif
+ifneq (,$(COQBIN))
+# add an ending /
+COQBIN:=$(COQBIN)/
+endif
+
# Coq binaries
COQC ?= "$(COQBIN)coqc"
COQTOP ?= "$(COQBIN)coqtop"
@@ -249,7 +254,6 @@ VO = vo
VOS = vos
VOFILES = $(VFILES:.v=.$(VO))
-VOSFILES = $(VFILES:.v=.$(VOS))
GLOBFILES = $(VFILES:.v=.glob)
HTMLFILES = $(VFILES:.v=.html)
GHTMLFILES = $(VFILES:.v=.g.html)
@@ -300,7 +304,6 @@ ALLNATIVEFILES = \
NATIVEFILES = $(wildcard $(ALLNATIVEFILES))
FILESTOINSTALL = \
$(VOFILES) \
- $(VOSFILES) \
$(VFILES) \
$(GLOBFILES) \
$(NATIVEFILES) \
@@ -753,7 +756,7 @@ VDFILE_FLAGS:=$(if @PROJECT_FILE@,-f @PROJECT_FILE@,) $(CMDLINE_COQLIBS) $(CMDLI
$(VDFILE): $(VFILES)
$(SHOW)'COQDEP VFILES'
- $(HIDE)$(COQDEP) -dyndep var $(VDFILE_FLAGS) $(redir_if_ok)
+ $(HIDE)$(COQDEP) -vos -dyndep var $(VDFILE_FLAGS) $(redir_if_ok)
# Misc ########################################################################