summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Nordberg <linus@nordberg.se>2015-04-01 13:12:52 +0200
committerLinus Nordberg <linus@nordberg.se>2015-04-01 13:14:07 +0200
commit4860fff216892010a997547b0fa19cd4505cb804 (patch)
treedf88d5ae7d5ac8e109eaaa276cae0ce09b16f7d4
parentb280c136a4279d9b3c46936f4737c47d83dae2fd (diff)
Do cd into $INSTDIR after all.
map is right.
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index e188e95..434fc5a 100644
--- a/Makefile
+++ b/Makefile
@@ -29,12 +29,12 @@ tests-prepare:
mkdir $(INSTDIR)/tests/known_roots
cp tools/testcerts/roots/* $(INSTDIR)/tests/known_roots
@for machine in $(MACHINES); do \
- tools/compileconfig.py --config=test/catlfish-test.cfg --localconfig test/catlfish-test-local-$$machine.cfg ; \
+ (cd $(INSTDIR); ../tools/compileconfig.py --config ../test/catlfish-test.cfg --localconfig ../test/catlfish-test-local-$$machine.cfg) ; \
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
+ (cd $(INSTDIR); ../tools/compileconfig.py --config ../test/catlfish-test.cfg --localconfig ../test/catlfish-test-local-signing.cfg)
mkdir $(INSTDIR)/tests/privatekeys
mkdir $(INSTDIR)/tests/publickeys
@for node in $(NODES); do \