From e5688b6c19bf5eef4a6cab52d4cfdc906e5db74e Mon Sep 17 00:00:00 2001
From: Eric Bailey <eric@ericb.me>
Date: Sat, 22 Aug 2020 07:37:21 -0500
Subject: [PATCH] Rework GAP tooling

---
 .dir-locals.el | 2 +-
 Makefile       | 6 +++---
 shell.nix      | 1 -
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.dir-locals.el b/.dir-locals.el
index 2311e26..fd0340a 100644
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -2,7 +2,7 @@
 ;;; For more information see (info "(emacs) Directory Variables")
 
 ((gap-mode
-  (eval . (setq gap-executable (getenv "GAP_EXECUTABLE"))))
+  (gap-executable . "gap"))
  (idris-mode
   (idris-interpreter-flags "-p" "contrib")
   (idris-interpreter-path . "idris")))
diff --git a/Makefile b/Makefile
index cfc29c3..7ff47f6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-srcs := \
+gap-srcs := \
 	PackageInfo.g \
 	init.g \
 	lib/gis.gd \
@@ -6,10 +6,10 @@ srcs := \
 	makedoc.g \
 	read.g
 
-check: ${srcs}
+gap-check: ${srcs}
 	gap --nointeract -l ";." -q tst/testall.g
 
-docs: makedoc.g ${srcs}
+gap-docs: makedoc.g ${srcs}
 	gap --nointeract -b $<
 
 
diff --git a/shell.nix b/shell.nix
index 13aa34f..0045a2a 100644
--- a/shell.nix
+++ b/shell.nix
@@ -24,5 +24,4 @@ pkgs.mkShell {
       pre-commit
     ]
   );
-  GAP_EXECUTABLE = "${pkgs.gap-full}/bin/gap";
 }