build: build with installed jerbuild (no ~/mine/jerboa dependency)
ober
74501b4016c901b5211c8cb017d5670de9155fd1
--- a/Makefile +++ b/Makefile @@ -1,7 +1,10 @@ -JERBOA_HOME ?= $(HOME)/mine/jerboa -SCHEME ?= $(JERBOA_HOME)/.chez/bin/scheme -JERBUILD ?= $(JERBOA_HOME)/jerbuild -LIBDIRS = lib:$(JERBOA_HOME)/lib +JERBUILD ?= jerbuild +JH := $(shell $(JERBUILD) --jerboa-home 2>/dev/null) +ifeq ($(JH),) +$(error jerbuild not found on PATH (or '$(JERBUILD) --jerboa-home' failed). Install jerbuild, or set JERBUILD=/path/to/jerbuild) +endif + +LIBDIRS = lib:$(JH)/lib CC ?= cc @@ -45,21 +48,21 @@ else EXTRA_LDPATH = endif -RUNTEST = JERBOA_FUSE_LIB=$(CURDIR) $(LD_VAR)=$(CURDIR)$(EXTRA_LDPATH) $(SCHEME) --libdirs "$(LIBDIRS)" +RUNTEST = JERBOA_FUSE_LIB=$(CURDIR) $(LD_VAR)=$(CURDIR)$(EXTRA_LDPATH) $(JERBUILD) exec --libdirs "$(LIBDIRS)" test: test-memfs test-secmem test-access test-memfs: build - $(RUNTEST) --script tests/test-memfs.ss + $(RUNTEST) tests/test-memfs.ss test-secmem: build - $(RUNTEST) --script tests/test-secmem.ss + $(RUNTEST) tests/test-secmem.ss test-access: build - $(RUNTEST) --script tests/test-access.ss + $(RUNTEST) tests/test-access.ss test-vault: build - $(RUNTEST) --script tests/test-vault.ss + $(RUNTEST) tests/test-vault.ss clean: rm -f $(SHIM) src/libchez_fuse_mount.*