Suffix PREFIX with '/catlfish' and use that as INSTDIR.

1 files changed, 38 insertions, 37 deletions

diff --git a/Makefile b/Makefile
index cad1a7e..ee801f7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
 # Makefile for catlfish
 
-PREFIX=rel
+PREFIX=.
+INSTDIR=$(PREFIX)/catlfish
 
 build all:
 	./make.erl
@@ -9,31 +10,31 @@ clean:
 	-rm ebin/*.beam
 
 release: all
-	rm -rf $(PREFIX)
-	mkdir $(PREFIX)
-	./makerelease.erl $(PREFIX)
+	rm -rf $(INSTDIR)
+	mkdir $(INSTDIR)
+	./makerelease.erl $(INSTDIR)
 
 -include test/test.mk
 
 tests-prepare:
-	rm -r $(PREFIX)/tests || true
-	mkdir $(PREFIX)/tests
+	rm -r $(INSTDIR)/tests || true
+	mkdir $(INSTDIR)/tests
 	make tests-createca
 	make tests-createcert
-	mkdir $(PREFIX)/tests/keys
-	(cd $(PREFIX)/tests/keys ; ../../../tools/create-key.sh logkey)
-	mkdir $(PREFIX)/tests/mergedb
-	mkdir $(PREFIX)/tests/mergedb/chains
-	touch $(PREFIX)/tests/mergedb/logorder
-	mkdir $(PREFIX)/tests/known_roots
-	cp tools/testcerts/roots/* $(PREFIX)/tests/known_roots
-	cp -r test/config/privatekeys $(PREFIX)/tests
-	cp -r test/config/publickeys $(PREFIX)/tests
+	mkdir $(INSTDIR)/tests/keys
+	(cd $(INSTDIR)/tests/keys ; ../../../tools/create-key.sh logkey)
+	mkdir $(INSTDIR)/tests/mergedb
+	mkdir $(INSTDIR)/tests/mergedb/chains
+	touch $(INSTDIR)/tests/mergedb/logorder
+	mkdir $(INSTDIR)/tests/known_roots
+	cp tools/testcerts/roots/* $(INSTDIR)/tests/known_roots
+	cp -r test/config/privatekeys $(INSTDIR)/tests
+	cp -r test/config/publickeys $(INSTDIR)/tests
 	@for machine in $(MACHINES); do \
 	  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 ; \
+	  mkdir -p $(INSTDIR)/tests/machine/machine-$$machine/db ; \
+	  touch $(INSTDIR)/tests/machine/machine-$$machine/db/index ; \
+	  touch $(INSTDIR)/tests/machine/machine-$$machine/db/newentries ; \
 	done
 	tools/compileconfig.py --config test/catlfish-test.cfg --localconfig test/catlfish-test-local-signing.cfg
 	@for node in $(NODES); do \
@@ -42,7 +43,7 @@ tests-prepare:
 
 tests-start:
 	@for node in $(NODES); do \
-	  (cd $(PREFIX) ; bin/run_erl -daemon ../test/nodes/$$node/ ../test/nodes/$$node/log/ "exec bin/erl -config $$node") \
+	  (cd $(INSTDIR) ; bin/run_erl -daemon ../test/nodes/$$node/ ../test/nodes/$$node/log/ "exec bin/erl -config $$node") \
 	done
 	@for i in 1 2 3 4 5 6 7 8 9 10; do \
 	  echo "waiting for system to start" ; \
@@ -58,20 +59,20 @@ tests-start:
 	done
 
 tests-run:
-	@(cd $(PREFIX) && python ../tools/testcase1.py https://localhost:8080/ tests/keys/logkey.pem) || (echo "Tests failed" ; false)
-	@(cd $(PREFIX) && python ../tools/fetchallcerts.py $(BASEURL) --publickey=tests/keys/logkey.pem) || (echo "Verification failed" ; false)
-	@(cd $(PREFIX) && rm -f submittedcerts)
-	@(cd $(PREFIX) && python ../tools/submitcert.py --parallel=1 --store ../tools/testcerts/cert1.txt --check-sct --sct-file=submittedcerts $(BASEURL) --publickey=tests/keys/logkey.pem) || (echo "Submission failed" ; false)
-	@(cd $(PREFIX) && python ../tools/submitcert.py --parallel=1 --store ../tools/testcerts/cert2.txt --check-sct --sct-file=submittedcerts $(BASEURL) --publickey=tests/keys/logkey.pem) || (echo "Submission failed" ; false)
-	@(cd $(PREFIX) && python ../tools/submitcert.py --parallel=1 --store ../tools/testcerts/cert3.txt --check-sct --sct-file=submittedcerts $(BASEURL) --publickey=tests/keys/logkey.pem) || (echo "Submission failed" ; false)
-	@(cd $(PREFIX) && python ../tools/submitcert.py --parallel=1 --store ../tools/testcerts/cert4.txt --check-sct --sct-file=submittedcerts $(BASEURL) --publickey=tests/keys/logkey.pem) || (echo "Submission failed" ; false)
-	@(cd $(PREFIX) && python ../tools/submitcert.py --parallel=1 --store ../tools/testcerts/cert5.txt --check-sct --sct-file=submittedcerts $(BASEURL) --publickey=tests/keys/logkey.pem) || (echo "Submission failed" ; false)
-	@(cd $(PREFIX) && python ../tools/submitcert.py --parallel=1 --store ../tools/testcerts/pre1.txt --check-sct --sct-file=submittedcerts $(BASEURL) --publickey=tests/keys/logkey.pem) || (echo "Submission failed" ; false)
-	@(cd $(PREFIX) && python ../tools/submitcert.py --parallel=1 --store ../tools/testcerts/pre2.txt --check-sct --sct-file=submittedcerts $(BASEURL) --publickey=tests/keys/logkey.pem) || (echo "Submission failed" ; false)
-	@(cd $(PREFIX) && python ../tools/merge.py --config ../test/catlfish-test.cfg --localconfig ../test/catlfish-test-local-merge.cfg) || (echo "Merge failed" ; false)
+	@(cd $(INSTDIR) && python ../tools/testcase1.py https://localhost:8080/ tests/keys/logkey.pem) || (echo "Tests failed" ; false)
+	@(cd $(INSTDIR) && python ../tools/fetchallcerts.py $(BASEURL) --publickey=tests/keys/logkey.pem) || (echo "Verification failed" ; false)
+	@(cd $(INSTDIR) && rm -f submittedcerts)
+	@(cd $(INSTDIR) && python ../tools/submitcert.py --parallel=1 --store ../tools/testcerts/cert1.txt --check-sct --sct-file=submittedcerts $(BASEURL) --publickey=tests/keys/logkey.pem) || (echo "Submission failed" ; false)
+	@(cd $(INSTDIR) && python ../tools/submitcert.py --parallel=1 --store ../tools/testcerts/cert2.txt --check-sct --sct-file=submittedcerts $(BASEURL) --publickey=tests/keys/logkey.pem) || (echo "Submission failed" ; false)
+	@(cd $(INSTDIR) && python ../tools/submitcert.py --parallel=1 --store ../tools/testcerts/cert3.txt --check-sct --sct-file=submittedcerts $(BASEURL) --publickey=tests/keys/logkey.pem) || (echo "Submission failed" ; false)
+	@(cd $(INSTDIR) && python ../tools/submitcert.py --parallel=1 --store ../tools/testcerts/cert4.txt --check-sct --sct-file=submittedcerts $(BASEURL) --publickey=tests/keys/logkey.pem) || (echo "Submission failed" ; false)
+	@(cd $(INSTDIR) && python ../tools/submitcert.py --parallel=1 --store ../tools/testcerts/cert5.txt --check-sct --sct-file=submittedcerts $(BASEURL) --publickey=tests/keys/logkey.pem) || (echo "Submission failed" ; false)
+	@(cd $(INSTDIR) && python ../tools/submitcert.py --parallel=1 --store ../tools/testcerts/pre1.txt --check-sct --sct-file=submittedcerts $(BASEURL) --publickey=tests/keys/logkey.pem) || (echo "Submission failed" ; false)
+	@(cd $(INSTDIR) && python ../tools/submitcert.py --parallel=1 --store ../tools/testcerts/pre2.txt --check-sct --sct-file=submittedcerts $(BASEURL) --publickey=tests/keys/logkey.pem) || (echo "Submission failed" ; false)
+	@(cd $(INSTDIR) && python ../tools/merge.py --config ../test/catlfish-test.cfg --localconfig ../test/catlfish-test-local-merge.cfg) || (echo "Merge failed" ; false)
 
 tests-run2:
-	@(cd $(PREFIX) ; python ../tools/verifysct.py --sct-file=submittedcerts --parallel 1 $(BASEURL) --publickey=tests/keys/logkey.pem) || echo "Verification of SCT:s failed"
+	@(cd $(INSTDIR) ; python ../tools/verifysct.py --sct-file=submittedcerts --parallel 1 $(BASEURL) --publickey=tests/keys/logkey.pem) || echo "Verification of SCT:s failed"
 
 tests-stop:
 	@for node in $(NODES); do \
@@ -95,8 +96,8 @@ tests:
 	@make tests-stop
 
 tests-createca:
-	mkdir $(PREFIX)/tests/httpsca
-	( cd $(PREFIX)/tests/httpsca ; \
+	mkdir $(INSTDIR)/tests/httpsca
+	( cd $(INSTDIR)/tests/httpsca ; \
 	  mkdir -p demoCA/newcerts ; \
 	  touch demoCA/index.txt ; \
 	  echo 00 > demoCA/serial ; \
@@ -111,12 +112,12 @@ tests-createca:
 	)
 
 tests-createcert:
-	mkdir $(PREFIX)/tests/httpscert
-	openssl req -new -newkey rsa:2048 -keyout $(PREFIX)/tests/httpscert/httpskey-1.pem -out $(PREFIX)/tests/httpsca/httpscert-1.csr -nodes -subj '/countryName=SE/stateOrProvinceName=Stockholm/organizationName=Test/CN=localhost'
-	( cd $(PREFIX)/tests/httpsca ; \
+	mkdir $(INSTDIR)/tests/httpscert
+	openssl req -new -newkey rsa:2048 -keyout $(INSTDIR)/tests/httpscert/httpskey-1.pem -out $(INSTDIR)/tests/httpsca/httpscert-1.csr -nodes -subj '/countryName=SE/stateOrProvinceName=Stockholm/organizationName=Test/CN=localhost'
+	( cd $(INSTDIR)/tests/httpsca ; \
 	  openssl ca -in httpscert-1.csr -keyfile key.pem -out httpscert-1.pem -batch \
 	)
-	cp $(PREFIX)/tests/httpsca/httpscert-1.pem $(PREFIX)/tests/httpscert/
+	cp $(INSTDIR)/tests/httpsca/httpscert-1.pem $(INSTDIR)/tests/httpscert/
 
 
 # Unit testing.