From: Howard Mao <zhehao.mao@gmail.com>
Date: Wed, 24 Feb 2016 07:11:27 +0000 (-0800)
Subject: make install rule copy the right things to the right places
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9ab937b3460e7003856277ddf5dd95ba60245916;p=riscv-tests.git

make install rule copy the right things to the right places
---

diff --git a/Makefile.in b/Makefile.in
index 002426c..541263b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -7,14 +7,18 @@ isa_src_dir     := $(abs_top_src_dir)/isa
 all: benchmarks isa
 
 install: all
-	install -d $(instbasedir)/share/riscv-tests
-	install -p -m 644 *.hex $(instbasedir)/share/riscv-tests
+	install -d $(instbasedir)/share/riscv-tests/isa
+	install -d $(instbasedir)/share/riscv-tests/benchmarks
+	install -p -m 644 isa/* $(instbasedir)/share/riscv-tests/isa
+	install -p -m 644 benchmarks/* $(instbasedir)/share/riscv-tests/benchmarks
 
 benchmarks:
-	$(MAKE) -f $(bmarkdir)/Makefile bmarkdir=$(bmarkdir)
+	mkdir -p benchmarks
+	$(MAKE) -C benchmarks -f $(bmarkdir)/Makefile bmarkdir=$(bmarkdir)
 
 isa:
-	$(MAKE) -f $(isa_src_dir)/Makefile isa_src_dir=$(isa_src_dir)
+	mkdir -p isa
+	$(MAKE) -C isa -f $(isa_src_dir)/Makefile isa_src_dir=$(isa_src_dir)
 
 clean:
 	$(MAKE) -f $(isa_src_dir)/Makefile isa_src_dir=$(isa_src_dir) clean