From b2bfc74fe2a378dfd271dc4dc64ca8dd1fc08333 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Mon, 26 Nov 2018 13:28:51 -0700
Subject: [PATCH] Improve definition of targets for prefix

---
 mk/prefix.mk | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/mk/prefix.mk b/mk/prefix.mk
index c9e02d2..2790e5f 100644
--- a/mk/prefix.mk
+++ b/mk/prefix.mk
@@ -4,7 +4,17 @@ PREFIX_BINUTILS_PATH=$(PREFIX)/binutils-install/bin
 PREFIX_FREESTANDING_PATH=$(PREFIX_BINUTILS_PATH):$(PREFIX)/gcc-freestanding-install/bin
 PREFIX_PATH=$(PREFIX_BINUTILS_PATH):$(PREFIX)/gcc-install/bin
 
-prefix: $(PREFIX)/gcc-install
+PREFIX_FREESTANDING_TARGETS=\
+	$(PREFIX)/binutils-install \
+	$(PREFIX)/gcc-freestanding-install
+
+PREFIX_TARGETS=\
+	$(PREFIX)/binutils-install \
+	$(PREFIX)/gcc-install
+
+prefix-freestanding: $(PREFIX_FREESTANDING_TARGETS)
+
+prefix: $(PREFIX_TARGETS)
 	touch "$@"
 
 $(PREFIX)/binutils.tar.bz2:
@@ -51,9 +61,9 @@ $(PREFIX)/gcc-freestanding-install: $(PREFIX)/gcc
 	make install-target-libgcc -j `nproc`
 	touch "$@"
 
-$(PREFIX)/relibc-install: $(PREFIX)/binutils-install $(PREFIX)/gcc-freestanding-install
+$(PREFIX)/relibc-install: $(ROOT)/relibc | $(PREFIX_FREESTANDING_TARGETS)
 	rm -rf "$@"
-	cd relibc && \
+	cd "$<" && \
 	export PATH="$(PREFIX_FREESTANDING_PATH):$$PATH" && \
 	make CARGO=xargo all && \
 	make CARGO=xargo DESTDIR="$@/usr" install