build: build with installed jerbuild (no ~/mine/jerboa dependency)
ober
b22b9c7439da4aaa43caacf5db1193516abee74c
--- a/Makefile +++ b/Makefile @@ -1,8 +1,11 @@ -JERBOA_HOME ?= $(HOME)/mine/jerboa -SCHEME ?= $(JERBOA_HOME)/.chez/bin/scheme -JERBUILD ?= $(JERBOA_HOME)/jerbuild +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 + SSL_DIR ?= ../jerboa-ssl -LIBDIRS = lib:$(SSL_DIR)/lib:$(JERBOA_HOME)/lib +LIBDIRS = lib:$(SSL_DIR)/lib:$(JH)/lib UNAME_S := $(shell uname -s) ifeq ($(UNAME_S),Darwin) @@ -28,12 +31,12 @@ test: test-https test-httpd test-https: build JERBOA_SSL_LIB=$(SSL_DIR) \ $(LD_VAR)=$(SSL_DIR) \ - $(SCHEME) --libdirs "$(LIBDIRS)" --script tests/https-test.ss + $(JERBUILD) exec --libdirs "$(LIBDIRS)" tests/https-test.ss test-httpd: build JERBOA_SSL_LIB=$(SSL_DIR) \ $(LD_VAR)=$(SSL_DIR) \ - $(SCHEME) --libdirs "$(LIBDIRS)" --script tests/httpd-test.ss + $(JERBUILD) exec --libdirs "$(LIBDIRS)" tests/httpd-test.ss clean: rm -rf lib