summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornsensfel <SpamShield0@noot-noot.org>2019-10-09 15:28:51 +0200
committernsensfel <SpamShield0@noot-noot.org>2019-10-09 15:28:51 +0200
commit64cab0e171ab13ced4c36ea40bff393d5093e075 (patch)
tree43dae5d52c060bfb0e270d8b4f676eec7b656bf8 /Makefile
parent10a531e4af6532be9c3f725760e973dbb8aa7aee (diff)
parentbac727f239201fe40dcddaade40da290d4f6e03e (diff)
Merge branch 'skills_and_conditions' of dreamhost:~/repositories/git/tacticians-server into skills_and_conditions
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 96e75d7..82c671b 100644
--- a/Makefile
+++ b/Makefile
@@ -11,6 +11,7 @@ INCLUDE_DIR ?= ${CURDIR}/include
WWW_DIR ?= ${CURDIR}/www
LOG_DIR ?= ${CURDIR}/log
DATA_DIR ?= /my/src/tacticians-data/
+ATAXIA_BIN_DIR ?= /my/src/ataxia/ebin
## Local only?
#ERL_NAME_VS_SNAME ?= -name
@@ -21,7 +22,8 @@ ERLC ?= erlc
ERLC_OPTS ?= -I $(INCLUDE_DIR)
ERL ?= erl
-ERL_OPTS ?= -connect_all false -pa `find $(BIN_DIR) -type d`
+ERL_OPTS ?= -connect_all false \
+ -pa `find $(BIN_DIR) -type d` `find $(ATAXIA_BIN_DIR) -type d`
YAWS ?= yaws
YAWS_OPTS ?= $(ERL_NAME_VS_SNAME) query_node -erlarg '$(ERL_OPTS)'