move more files out of /

3 files changed, 10 insertions, 4 deletions

diff --git a/Makefile b/Makefile
index 785c4ac..d3346ed 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ SSHD_CONFIG_DIR = $(SSH_CONFIG_DIR)/sshd_config.d
 SSH_LIB_DIR = /usr/lib/ssh
 USER_SSH_CONFIG_DIR = ~$(USER)/.ssh
 
-.PHONY: install shared doc
+.PHONY: install shared doc test
 
 shared: install
         git config core.self-forge true
@@ -29,7 +29,9 @@ install:
         [ -e "$(SSH_LIB_DIR)"/AuthorizedKeysCommand ] || $(SUDO) ln -s -t /etc/ssh "$(SSH_LIB_DIR)"/AuthorizedKeysCommand
 
 doc: README.html
+
 README.html: README.md
         pandoc -t html $< > $@
 
-include tests.makefile
+test:
+        make -C test
diff --git a/tests.makefile b/test/Makefile
index 81c9312..3bc1a66 100644
--- a/tests.makefile
+++ b/test/Makefile
@@ -1,3 +1,7 @@
+.DEFAULT_GOAL = test
+
+include ../Makefile
+
 testuser = testuser
 
 SU = $(SUDO) su
@@ -10,8 +14,8 @@ useradd:
         $(SU) - $(testuser) -c 'git config --global user.name $(testuser)'
         $(SU) - $(testuser) -c 'git config --global user.email $(testuser)'
 
-test: install $(shell getent passwd $(testuser) >/dev/null || echo useradd)
-        $(ROOT_INSTALL) -t ~$(testuser) $(SRC)/tests.sh
+test: $(shell getent passwd $(testuser) >/dev/null || echo useradd)
+        $(ROOT_INSTALL) -t ~$(testuser) tests.sh
         $(SU) - $(testuser) -c ./tests.sh
 
 ifeq ($(testuser),)
diff --git a/src/tests.sh b/test/tests.sh
index 5d221b6..5d221b6 100644
--- a/src/tests.sh
+++ b/test/tests.sh