From 1e269d9fabe3d681e9aac723ed5c6680c1217f24 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Fri, 22 May 2020 19:56:04 -0600
Subject: [PATCH] Add INSTALLER variable

---
 mk/config.mk     |  4 ++++
 mk/filesystem.mk |  6 ++----
 mk/initfs.mk     | 12 ++++++------
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/mk/config.mk b/mk/config.mk
index 5c68dfb..7c43299 100644
--- a/mk/config.mk
+++ b/mk/config.mk
@@ -46,6 +46,10 @@ KBUILD=build/kernel
 ## Userspace variables
 export TARGET=$(ARCH)-unknown-redox
 BUILD=build/userspace
+INSTALLER=\
+	export REDOXER_TOOLCHAIN="$(ROOT)/$(PREFIX_INSTALL)" && \
+	export PATH="$(PREFIX_PATH):$$PATH" && \
+ 	installer/target/release/redox_installer $(INSTALLER_FLAGS)
 
 ## Bootloader variables
 EFI_TARGET=$(ARCH)-efi-pe
diff --git a/mk/filesystem.mk b/mk/filesystem.mk
index d98bce5..2641376 100644
--- a/mk/filesystem.mk
+++ b/mk/filesystem.mk
@@ -1,6 +1,6 @@
 build/filesystem.bin: filesystem.toml build/bootloader build/kernel prefix
-	cargo build --manifest-path redoxfs/Cargo.toml --release
 	cargo build --manifest-path installer/Cargo.toml --release
+	cargo build --manifest-path redoxfs/Cargo.toml --release
 	-$(FUMOUNT) build/filesystem/ || true
 	rm -rf $@  $@.partial build/filesystem/
 	dd if=/dev/zero of=$@.partial bs=1048576 count="$(FILESYSTEM_SIZE)"
@@ -14,9 +14,7 @@ build/filesystem.bin: filesystem.toml build/bootloader build/kernel prefix
 	cp build/kernel build/filesystem/kernel
 	cp -r $(ROOT)/$(PREFIX_INSTALL)/$(TARGET)/include build/filesystem/include
 	cp -r $(ROOT)/$(PREFIX_INSTALL)/$(TARGET)/lib build/filesystem/lib
-	export REDOXER_TOOLCHAIN="$(ROOT)/$(PREFIX_INSTALL)" && \
-	export PATH="$(PREFIX_PATH):$$PATH" && \
- 	installer/target/release/redox_installer $(INSTALLER_FLAGS) -c $< build/filesystem/
+	$(INSTALLER) -c $< build/filesystem/
 	sync
 	-$(FUMOUNT) build/filesystem/ || true
 	rm -rf build/filesystem/
diff --git a/mk/initfs.mk b/mk/initfs.mk
index 59bb6d6..8e9b4fd 100644
--- a/mk/initfs.mk
+++ b/mk/initfs.mk
@@ -1,23 +1,23 @@
 build/initfs.tag: initfs.toml prefix
+	cargo build --manifest-path installer/Cargo.toml --release
 	rm -f build/libkernel.a
 	rm -rf build/initfs
 	mkdir -p build/initfs
-	export PATH="$(PREFIX_PATH):$$PATH" && \
-	cargo run --manifest-path installer/Cargo.toml -- $(INSTALLER_FLAGS) -c $< build/initfs/
+	$(INSTALLER) -c $< build/initfs/
 	touch $@
 
 build/initfs_coreboot.tag: initfs_coreboot.toml prefix
+	cargo build --manifest-path installer/Cargo.toml --release
 	rm -f build/libkernel_coreboot.a
 	rm -rf build/initfs_coreboot
 	mkdir -p build/initfs_coreboot
-	export PATH="$(PREFIX_PATH):$$PATH" && \
-	cargo run --manifest-path installer/Cargo.toml -- $(INSTALLER_FLAGS) -c $< build/initfs_coreboot/
+	$(INSTALLER) -c $< build/initfs_coreboot/
 	touch $@
 
 build/initfs_live.tag: initfs_live.toml prefix
+	cargo build --manifest-path installer/Cargo.toml --release
 	rm -f build/libkernel_live.a
 	rm -rf build/initfs_live
 	mkdir -p build/initfs_live
-	export PATH="$(PREFIX_PATH):$$PATH" && \
-	cargo run --manifest-path installer/Cargo.toml -- $(INSTALLER_FLAGS) -c $< build/initfs_live/
+	$(INSTALLER) -c $< build/initfs_live/
 	touch $@