revert install rule to the old correct way

[riscv-tests.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index f81b39424a8972cc7684539910d96911425a5b8b..58716b8f72d80f7b819526b6596acff0d46ac82d 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -7,12 +7,22 @@ isa_src_dir     := $(abs_top_src_dir)/isa
 all: benchmarks isa
 
 install: all
-       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 src_dir=$(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 src_dir=$(isa_src_dir)
+
+clean:
+       $(MAKE) -C isa -f $(isa_src_dir)/Makefile src_dir=$(isa_src_dir) clean
+       $(MAKE) -C benchmarks -f $(bmarkdir)/Makefile src_dir=$(bmarkdir) clean
+
+.PHONY: benchmarks isa clean
 
-.PHONY: benchmarks isa