From 9afc78b42d13ec5ccbb61de02b637ec7217b8690 Mon Sep 17 00:00:00 2001
From: Linus Nordberg <linus@nordberg.se>
Date: Fri, 27 Mar 2015 13:28:33 +0100
Subject: Docker packaging.

---
 Makefile | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 51fd786..87165b5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,17 @@
+# Makefile for catlfish
+
 PREFIX=rel
 
 build all:
 	./make.erl
+
 clean:
 	-rm ebin/*.beam
+
 release: all
 	rm -rf $(PREFIX)
 	mkdir $(PREFIX)
-	./makerelease.erl
-	mkdir $(PREFIX)/catlfish
+	./makerelease.erl $(PREFIX)
 
 -include test/test.mk
 
@@ -25,12 +28,12 @@ tests-prepare:
 	mkdir $(PREFIX)/tests/known_roots
 	cp tools/testcerts/roots/* $(PREFIX)/tests/known_roots
 	@for machine in $(MACHINES); do \
-	  (cd $(PREFIX); ../tools/compileconfig.py --config=../test/catlfish-test.cfg --localconfig ../test/catlfish-test-local-$$machine.cfg) ; \
+	  tools/compileconfig.py --config=test/catlfish-test.cfg --localconfig test/catlfish-test-local-$$machine.cfg ; \
 	  mkdir -p $(PREFIX)/tests/machine/machine-$$machine/db ; \
 	  touch $(PREFIX)/tests/machine/machine-$$machine/db/index ; \
 	  touch $(PREFIX)/tests/machine/machine-$$machine/db/newentries ; \
 	done
-	(cd $(PREFIX); ../tools/compileconfig.py --config=../test/catlfish-test.cfg --localconfig ../test/catlfish-test-local-signing.cfg)
+	tools/compileconfig.py --config test/catlfish-test.cfg --localconfig test/catlfish-test-local-signing.cfg
 	mkdir $(PREFIX)/tests/privatekeys
 	mkdir $(PREFIX)/tests/publickeys
 	@for node in $(NODES); do \
-- 
cgit v1.1