correctly placed aw-server-rust module in subdirectory, updated aw-se…

…rver-rust submodule to correctly name executable as aw-server-rust
snowy1220 · Feb 1, 2020 · 50346bd · 50346bd
1 parent cbdc3b4
commit 50346bd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -166,7 +166,8 @@ package:
 	cp -r aw-server/dist/aw-server dist/activitywatch
 #
 	make --directory=aw-server-rust package
-	cp -r aw-server-rust/target/package/* dist/activitywatch
+	mkdir dist/activitywatch/aw-server-rust
+	cp -r aw-server-rust/target/package/* dist/activitywatch/aw-server-rust
 #
 	make --directory=aw-qt package
 	cp -r aw-qt/dist/aw-qt/. dist/activitywatch

diff --git a/aw-server-rust b/aw-server-rust