From 6883a7dced5b3e466819e3abd703764b7864da81 Mon Sep 17 00:00:00 2001
From: "Lance R. Vick" <lance@lrvick.net>
Date: Mon, 27 Feb 2023 14:26:04 -0800
Subject: [PATCH] add DIST_DIR target

---
 Makefile | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index 2569eba..3fc54e4 100644
--- a/Makefile
+++ b/Makefile
@@ -49,7 +49,6 @@ executables = $(docker) git patch
 toolchain: \
 	$(CACHE_DIR) \
 	$(FETCH_DIR) \
-	$(DIST_DIR) \
 	$(BIN_DIR) \
 	$(OUT_DIR) \
 	$(CACHE_DIR_ROOT)/toolchain.tar \
@@ -88,8 +87,10 @@ attest: toolchain-clean
 	$(MAKE) TARGET=$(TARGET) VERSION=$(VERSION)
 	diff -q $(OUT_DIR)/manifest.txt $(DIST_DIR)/manifest.txt;
 
-$(DIST_DIR):
+$(DIST_DIR): default
 	mkdir -p $@
+	rm -rf $@/*
+	cp -R $(OUT_DIR)/* $@/
 
 $(BIN_DIR):
 	mkdir -p $@
@@ -131,16 +132,6 @@ $(CACHE_DIR_ROOT)/toolchain.state: \
 	docker load -i $(CACHE_DIR_ROOT)/toolchain.tar
 	docker images --no-trunc --quiet $(IMAGE) > $@
 
-$(DIST_DIR)/release.env: \
-	$(DIST_DIR) \
-	$(OUT_DIR)/release.env
-	cp $(OUT_DIR)/release.env $(DIST_DIR)/release.env
-
-$(DIST_DIR)/manifest.txt: \
-	$(DIST_DIR) \
-	$(OUT_DIR)/manifest.txt
-	cp $(OUT_DIR)/manifest.txt $(DIST_DIR)/manifest.txt
-
 $(OUT_DIR)/release.env: | $(OUT_DIR)
 	echo 'VERSION=$(VERSION)'              > $(OUT_DIR)/release.env
 	echo 'GIT_REF=$(GIT_REF)'             >> $(OUT_DIR)/release.env