From 51c39c73692e755596eafb0d6f732581fee3ba98 Mon Sep 17 00:00:00 2001
From: dzwdz
Date: Sat, 25 Feb 2023 19:18:33 +0100
Subject: merge the initrd and sysroot directories

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 003343e..af881e9 100644
--- a/Makefile
+++ b/Makefile
@@ -118,14 +118,14 @@ $(foreach bin,$(USERBINS),$(eval $(call userbin_template,$(bin))))
 out/obj/user/app/ext2fs/ext2/example.c.o:
 	@touch $@
 
-out/initrd/%: initrd/%
+out/initrd/%: sysroot/%
 	@mkdir -p $(@D)
 	@cp $< $@
 
 out/initrd/font.psf:
 	curl -L https://github.com/legionus/kbd/raw/master/data/consolefonts/default8x16.psfu > $@
 
-out/initrd.tar: $(patsubst %,out/%,$(shell find initrd/ -type f)) \
+out/initrd.tar: $(patsubst sysroot/%,out/initrd/%,$(shell find sysroot/ -type f)) \
                 $(patsubst %,out/initrd/bin/amd64/%,$(USERBINS)) \
                 $(shell find out/initrd/) \
                 out/initrd/font.psf
-- 
cgit v1.2.3