Remove hardcoded ~/mine/ path from JERBOA_HOME defaults
ober
fbacc3578b9df58bfc2d7f1e50a7554f77e26442
--- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -JERBOA_HOME ?= $(HOME)/mine/jerboa +JERBOA_HOME ?= $(realpath $(CURDIR)/../jerboa) SCHEME ?= scheme BIN_DIR := $(HOME)/.local/bin TEMPLATE_DIR := $(HOME)/.git-templates --- a/build-binary.ss +++ b/build-binary.ss @@ -70,8 +70,14 @@ (exit 1)) (define home (getenv "HOME")) -(define jerboa-dir (or (getenv "JERBOA_HOME") - (format "~a/mine/jerboa" home))) +(define jerboa-dir + (or (getenv "JERBOA_HOME") + (let ([sibling (format "~a/../jerboa" + (current-directory))]) + (and (file-exists? sibling) sibling)) + (begin + (display "Error: Cannot find Jerboa. Set JERBOA_HOME.\n") + (exit 1)))) (printf "Chez dir: ~a\n" chez-dir) (printf "Jerboa dir: ~a\n" jerboa-dir)