From 09bd6b1bc2a04d9cdbc46025a8edb30854b61a57 Mon Sep 17 00:00:00 2001
From: Ron Williams <ron.williams@englishbluffcg.com>
Date: Tue, 15 Nov 2022 15:05:34 -0800
Subject: [PATCH] Move Rust install to build dir

---
 mk/podman.mk | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/mk/podman.mk b/mk/podman.mk
index f4c4d7533..7df84fdc6 100644
--- a/mk/podman.mk
+++ b/mk/podman.mk
@@ -8,7 +8,7 @@ IMAGE_TAG?=redox-base
 ## Working Directory in Podman
 CONTAINER_WORKDIR?=/mnt/redox
 ## Podman Home Directory
-PODMAN_HOME?=build/podman
+PODMAN_HOME?="`pwd`/build/podman"
 ## Podman command with its many arguments
 PODMAN_VOLUMES?=--volume "`pwd`":$(CONTAINER_WORKDIR):Z --volume $(PODMAN_HOME):/home:Z
 PODMAN_ENV?=--env PATH=/home/poduser/.cargo/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin --env PODMAN_BUILD=0
@@ -25,8 +25,7 @@ endif
 
 container_clean: FORCE
 	rm -f build/container.tag
-	@echo "If podman dir cannot be removed, "
-	@echo "remove with \"sudo rm\"."
+	@echo "If podman dir cannot be removed, remove with \"sudo rm\"."
 	-rm -rf $(PODMAN_HOME) || true
 	@echo "For complete clean of images and containers, use \"podman system reset\""
 	-podman image rm --force $(IMAGE_TAG) || true
@@ -44,8 +43,7 @@ endif
 build/container.tag: $(CONTAINERFILE)
 ifeq ($(PODMAN_BUILD),1)
 	rm -f build/container.tag
-	@echo "If podman_home dir cannot be removed, "
-	@echo "remove with \"sudo rm\"."
+	@echo "If podman_home dir cannot be removed, remove with \"sudo rm\"."
 	-rm -rf $(PODMAN_HOME) || true
 	-podman image rm --force $(IMAGE_TAG) || true
 	mkdir -p $(PODMAN_HOME)
-- 
GitLab