diff options
| -rw-r--r-- | .dir-locals.el (renamed from .dir-locals.el.in) | 6 | ||||
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile | 4 |
3 files changed, 3 insertions, 8 deletions
diff --git a/.dir-locals.el.in b/.dir-locals.el index 3e674b5b7..5b1fb274b 100644 --- a/.dir-locals.el.in +++ b/.dir-locals.el @@ -1,5 +1,5 @@ ((coq-mode . ((eval . (let* ((project-root (locate-dominating-file buffer-file-name "_CoqProject")) - (coqprime-folder (expand-file-name "@COQPRIME@" project-root)) - (coq-path (parse-colon-path (or (getenv "COQPATH") "")))) + (coqprime-folder (expand-file-name "coqprime" project-root)) + (coq-path (split-string (or (getenv "COQPATH") "") ":" t))) (unless (memql coqprime-folder coq-path) - (setenv "COQPATH" (mapconcat #'identity (cons coqprime-folder coq-path) path-separator)))))))) + (setenv "COQPATH" (mapconcat #'identity (cons coqprime-folder coq-path) ":")))))))) diff --git a/.gitignore b/.gitignore index db3634707..8547a7612 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,6 @@ *.vo *~ .#* -/.dir-locals.el Makefile.bak Makefile.coq Makefile.coq.bak @@ -113,16 +113,12 @@ clean:: rm -f Makefile.coq cleanall:: clean clean-coqprime - rm -f .dir-locals.el install: coq install-coqprime printenv:: @echo "COQPATH = $$COQPATH" -.dir-locals.el:: - sed 's:@COQPRIME@:$(COQPRIME_FOLDER):g' .dir-locals.el.in > $@ - printdeps:: $(HIDE)$(foreach vo,$(filter %.vo,$(MAKECMDGOALS)),echo '$(vo): $(call vo_closure,$(vo))'; ) |