From f0e6e8559ab4950e3629f771ed2eaa166636dcd6 Mon Sep 17 00:00:00 2001
From: Jason Gross <jgross@mit.edu>
Date: Mon, 24 Apr 2017 13:09:06 -0400
Subject: Track .dir-locals.el rather than generating it

Since we're only using one version of coqprime, we no longer need to
generate .dir-locals.el
---
 .dir-locals.el    | 5 +++++
 .dir-locals.el.in | 5 -----
 .gitignore        | 1 -
 Makefile          | 4 ----
 4 files changed, 5 insertions(+), 10 deletions(-)
 create mode 100644 .dir-locals.el
 delete mode 100644 .dir-locals.el.in

diff --git a/.dir-locals.el b/.dir-locals.el
new file mode 100644
index 000000000..5b1fb274b
--- /dev/null
+++ b/.dir-locals.el
@@ -0,0 +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 (split-string (or (getenv "COQPATH") "") ":" t)))
+                        (unless (memql coqprime-folder coq-path)
+                          (setenv "COQPATH" (mapconcat #'identity (cons coqprime-folder coq-path) ":"))))))))
diff --git a/.dir-locals.el.in b/.dir-locals.el.in
deleted file mode 100644
index 3e674b5b7..000000000
--- a/.dir-locals.el.in
+++ /dev/null
@@ -1,5 +0,0 @@
-((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") ""))))
-                        (unless (memql coqprime-folder coq-path)
-                          (setenv "COQPATH" (mapconcat #'identity (cons coqprime-folder coq-path) path-separator))))))))
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
diff --git a/Makefile b/Makefile
index 4e0539beb..3324ec86a 100644
--- a/Makefile
+++ b/Makefile
@@ -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))'; )
 
-- 
cgit v1.2.3