Skip to content

Commit 6da3547

Browse files
authored
Build .glob files at the default place and install them (#529)
- Build .glob files in the same directory as the source .v file (Coq default) - Install .glob files along with .vo and .v files Fixes: #526
1 parent a735bfb commit 6da3547

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

Makefile

+6-5
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,8 @@ FORCE:
260260
documentation: $(FILES)
261261
mkdir -p doc/html
262262
rm -f doc/html/*.html
263-
coq2html -d doc/html/ -base compcert -short-names doc/*.glob \
263+
coq2html -d doc/html/ -base compcert -short-names \
264+
$(patsubst %, %/*.glob, $(DIRS)) \
264265
$(filter-out doc/coq2html cparser/Parser.v, $^)
265266

266267
tools/ndfun: tools/ndfun.ml
@@ -283,7 +284,7 @@ latexdoc:
283284
%.vo: %.v
284285
@rm -f doc/$(*F).glob
285286
@echo "COQC $*.v"
286-
@$(COQC) -dump-glob doc/$(*F).glob $*.v
287+
@$(COQC) $*.v
287288
@$(PROFILE_ZIP)
288289

289290
%.v: %.vp tools/ndfun
@@ -358,8 +359,7 @@ ifeq ($(INSTALL_COQDEV),true)
358359
for d in $(DIRS); do \
359360
set -e; \
360361
install -d $(DESTDIR)$(COQDEVDIR)/$$d; \
361-
install -m 0644 $$d/*.vo $(DESTDIR)$(COQDEVDIR)/$$d/; \
362-
install -m 0644 $$d/*.v $(DESTDIR)$(COQDEVDIR)/$$d/; \
362+
install -m 0644 $$d/*.v $$d/*.vo $$d/*.glob $(DESTDIR)$(COQDEVDIR)/$$d/; \
363363
if test -d $$d/.coq-native; then \
364364
install -d $(DESTDIR)$(COQDEVDIR)/$$d/.coq-native; \
365365
install -m 0644 $$d/.coq-native/* $(DESTDIR)$(COQDEVDIR)/$$d/.coq-native/; \
@@ -375,7 +375,8 @@ clean:
375375
rm -f $(patsubst %, %/*.vo*, $(DIRS))
376376
rm -f $(patsubst %, %/.*.aux, $(DIRS))
377377
rm -rf $(patsubst %, %/.coq-native, $(DIRS))
378-
rm -rf doc/html doc/*.glob
378+
rm -f $(patsubst %, %/*.glob, $(DIRS))
379+
rm -rf doc/html
379380
rm -f driver/Version.ml
380381
rm -f compcert.ini compcert.config
381382
rm -f extraction/STAMP extraction/*.ml extraction/*.mli .depend.extr

0 commit comments

Comments
 (0)