Makefile: fix build target directory

Signed-off-by: Xynnn007 <[email protected]>

attestation-service/Makefile

@@ -2,7 +2,7 @@ PROJDIR := $(shell readlink -f ..)
 TOP_DIR := .
 CUR_DIR := $(shell pwd)
 PREFIX := /usr/local
-TARGET_DIR := target
+TARGET_DIR := ../target
 BIN_NAMES := grpc-as
 
 DEBUG ?=

kbs/Makefile

@@ -16,29 +16,29 @@ build: background-check-kbs
 
 .PHONY: background-check-kbs
 background-check-kbs:
-	cargo build --locked --release --no-default-features --features $(AS_FEATURE),resource,$(HTTPS_CRYPTO),$(POLICY_ENGINE)
+	cargo build -p kbs --locked --release --no-default-features --features $(AS_FEATURE),resource,$(HTTPS_CRYPTO),$(POLICY_ENGINE)
 
 .PHONY: passport-issuer-kbs
 passport-issuer-kbs:
-	cargo build --locked --release --no-default-features --features $(AS_FEATURE),$(HTTPS_CRYPTO)
-	mv target/release/kbs target/release/issuer-kbs
+	cargo build -p kbs --locked --release --no-default-features --features $(AS_FEATURE),$(HTTPS_CRYPTO)
+	mv ../target/release/kbs ../target/release/issuer-kbs
 
 .PHONY: passport-resource-kbs
 passport-resource-kbs:
-	cargo build --locked --release --no-default-features --features $(HTTPS_CRYPTO),resource,$(POLICY_ENGINE)
-	mv target/release/kbs target/release/resource-kbs
+	cargo build -p kbs --locked --release --no-default-features --features $(HTTPS_CRYPTO),resource,$(POLICY_ENGINE)
+	mv ../target/release/kbs ../target/release/resource-kbs
 
 install-kbs:
-	install -D -m0755 target/release/kbs $(INSTALL_DESTDIR)
-	install -D -m0755 target/release/kbs-client $(INSTALL_DESTDIR)
+	install -D -m0755 ../target/release/kbs $(INSTALL_DESTDIR)
+	install -D -m0755 ../target/release/kbs-client $(INSTALL_DESTDIR)
 
 install-issuer-kbs:
-	install -D -m0755 target/release/issuer-kbs $(INSTALL_DESTDIR)
-	install -D -m0755 target/release/kbs-client $(INSTALL_DESTDIR)
+	install -D -m0755 ../target/release/issuer-kbs $(INSTALL_DESTDIR)
+	install -D -m0755 ../target/release/kbs-client $(INSTALL_DESTDIR)
 
 install-resource-kbs:
-	install -D -m0755 target/release/resource-kbs $(INSTALL_DESTDIR)
-	install -D -m0755 target/release/kbs-client $(INSTALL_DESTDIR)
+	install -D -m0755 ../target/release/resource-kbs $(INSTALL_DESTDIR)
+	install -D -m0755 ../target/release/kbs-client $(INSTALL_DESTDIR)
 
 uninstall:
 	rm -rf $(INSTALL_DESTDIR)/kbs $(INSTALL_DESTDIR)/kbs-client $(INSTALL_DESTDIR)/issuer-kbs $(INSTALL_DESTDIR)/resource-kbs

kbs/test/Makefile

@@ -35,18 +35,18 @@ install-dependencies:
 kbs:
 	cd $(PROJECT_DIR) && \
 	make background-check-kbs POLICY_ENGINE=opa && \
-	install -D --compare $(PROJECT_DIR)/target/release/kbs $(CURDIR)/kbs
+	install -D --compare $(PROJECT_DIR)/../target/release/kbs $(CURDIR)/kbs
 
 resource-kbs:
 	cd $(PROJECT_DIR) && \
 	make passport-resource-kbs POLICY_ENGINE=opa && \
-	install -D --compare $(PROJECT_DIR)/target/release/resource-kbs $(CURDIR)/resource-kbs
+	install -D --compare $(PROJECT_DIR)/../target/release/resource-kbs $(CURDIR)/resource-kbs
 
 client:
 	cd $(PROJECT_DIR) && \
 	cargo build -p kbs-client --release \
 		--features api-server/coco-as-builtin,api-server/rustls && \
-	install -D --compare $(PROJECT_DIR)/target/release/kbs-client $(CURDIR)/client
+	install -D --compare $(PROJECT_DIR)/../target/release/kbs-client $(CURDIR)/client
 
 .PHONY: bins
 bins: kbs resource-kbs client