From a655d7b9e2c3cf35eea9d99a6b30fdfad3e2b2f8 Mon Sep 17 00:00:00 2001
From: Jarek Kowalski <jaak@jkowalski.net>
Date: Fri, 12 Feb 2021 18:36:01 -0800
Subject: [PATCH] minor build tweaks (#830)

---
 .github/workflows/make.yml | 2 +-
 Makefile                   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/make.yml b/.github/workflows/make.yml
index 669f60302..f163ce3ef 100644
--- a/.github/workflows/make.yml
+++ b/.github/workflows/make.yml
@@ -27,7 +27,7 @@ jobs:
       WINDOWS_SIGN_USER: ${{ secrets.WINDOWS_SIGN_USER }}
       WINDOWS_SIGN_AUTH: ${{ secrets.WINDOWS_SIGN_AUTH }}
       WINDOWS_CERT_SHA1: ${{ secrets.WINDOWS_CERT_SHA1 }}     
-      WINDOWS_SIGN_TOOL: "C:/Program Files (x86)/Windows Kits/10/bin/10.0.18362.0/x64/signtool.exe"
+      WINDOWS_SIGN_TOOL: ${{ secrets.WINDOWS_SIGN_TOOL }}
 
       # macOS signing certificate (base64-encoded), used by Electron Builder
       CSC_LINK: ${{ secrets.CSC_LINK }}
diff --git a/Makefile b/Makefile
index f97b32c3b..e7ba5055e 100644
--- a/Makefile
+++ b/Makefile
@@ -108,10 +108,10 @@ kopia-ui:
 # kopia-ui build needs this particular location to embed the correct server binary.
 # note we're not building or embedding HTML UI to speed up PR testing process.
 build-current-os-noui:
-	go build -o dist/kopia_$(shell go env GOOS)_$(shell go env GOARCH)$(exe_suffix)
+	go build -o dist/kopia_$(shell go env GOOS)_$(shell go env GOARCH)/kopia$(exe_suffix)
 
 build-current-os-with-ui: html-ui-bindata
-	go build -o dist/kopia_$(shell go env GOOS)_$(shell go env GOARCH)$(exe_suffix) -tags embedhtml
+	go build -o dist/kopia_$(shell go env GOOS)_$(shell go env GOARCH)/kopia$(exe_suffix) -tags embedhtml
 
 kopia-ui-pr-test: app-node-modules htmlui-node-modules
 	$(MAKE) build-current-os-with-ui