From 1cfbd25dc9eb39467406686c8ae1efbfd5517865 Mon Sep 17 00:00:00 2001
From: Danny Holman <dholman@gymli.org>
Date: Sat, 3 May 2025 13:01:25 -0500
Subject: kernel: x86_64: rename x86

Rename the x86 arch-specific directory to x86_64, reflecting clang's
architecture selector flags.

Signed-off-by: Danny Holman <dholman@gymli.org>
---
 Makefile | 77 ++++++++++++++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 58 insertions(+), 19 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 50d1fc5..d66b8ba 100644
--- a/Makefile
+++ b/Makefile
@@ -1,30 +1,69 @@
-ARCH?=x86
-DESTDIR?=base-system
-PREFIX?=/usr
+VERSION:=$(shell git describe --abbrev=4 --dirty --always --tags)
+ROOTDIR:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))/
+SYS_INCLUDE:=-I$(ROOTDIR)include
+include build.conf
+export ARCH VERSION ROOTDIR DESTDIR SYS_INCLUDE CC LD
 
-# -- Do not edit below this line --
+SUBDIRS:=bootstrap \
+	 kernel \
 
-VERSION:="$(shell git describe --abbrev=4 --dirty --always --tags)"
-ARCH:=$(ARCH)
-DESTDIR:=base-system/
-PREFIX:=/usr/
-export ARCH VERSION PREFIX
-
-SUBDIRS:=kernel \
-	 bin \
-	 lib \
-	 sbin \
-	 usr.sbin \
-
-.PHONY: all clean install install-headers $(SUBDIRS)
+.PHONY: all clean modules install install-headers $(SUBDIRS)
 
 all: $(SUBDIRS)
 
 subdirs: $(SUBDIRS)
 
 $(SUBDIRS):
-	$(MAKE) $(MAKECMDGOALS) -C $@
+	$(MAKE) -j $(JOBS) $(MAKECMDGOALS) -C $@
 
 clean: $(SUBDIRS)
+	$(RM) -r $(DESTDIR) $(DESTDIR).tar.zst
+
+create-basedir:
+	install -d -m 0755 $(DESTDIR)
+	install -d -m 0755 $(DESTDIR)/bin
+	install -d -m 0755 $(DESTDIR)/boot
+	install -d -m 0755 $(DESTDIR)/etc
+	install -d -m 0755 $(DESTDIR)/home
+	install -d -m 0755 $(DESTDIR)/lib
+	install -d -m 0755 $(DESTDIR)/mnt
+	install -d -m 0755 $(DESTDIR)/opt
+	install -d -m 0755 $(DESTDIR)/proc
+	install -d -m 0755 $(DESTDIR)/root
+	install -d -m 0755 $(DESTDIR)/sbin
+	install -d -m 0755 $(DESTDIR)/tmp
+	install -d -m 0755 $(DESTDIR)/usr
+	install -d -m 0755 $(DESTDIR)/usr/bin
+	install -d -m 0755 $(DESTDIR)/usr/include
+	install -d -m 0755 $(DESTDIR)/usr/lib
+	install -d -m 0755 $(DESTDIR)/usr/local
+	install -d -m 0755 $(DESTDIR)/usr/local/bin
+	install -d -m 0755 $(DESTDIR)/usr/local/include
+	install -d -m 0755 $(DESTDIR)/usr/local/man
+	install -d -m 0755 $(DESTDIR)/usr/local/sbin
+	install -d -m 0755 $(DESTDIR)/usr/local/share
+	install -d -m 0755 $(DESTDIR)/usr/local/src
+	install -d -m 0755 $(DESTDIR)/usr/sbin
+	install -d -m 0755 $(DESTDIR)/usr/share
+	install -d -m 0755 $(DESTDIR)/usr/src
+	install -d -m 0755 $(DESTDIR)/var
+	install -d -m 0755 $(DESTDIR)/var/cache
+	install -d -m 0755 $(DESTDIR)/var/lib
+	install -d -m 0755 $(DESTDIR)/var/lock
+	install -d -m 0755 $(DESTDIR)/var/log
+	install -d -m 0755 $(DESTDIR)/var/run
+	install -d -m 0755 $(DESTDIR)/var/tmp
+
+install: create-basedir subdirs
+	cp -R etc/* $(DESTDIR)/etc
+	cp -R usr.share/* $(DESTDIR)/usr/share
+	tar -cvf $(DESTDIR).tar $(DESTDIR)
+	zstd $(DESTDIR).tar
+	$(RM) -r $(DESTDIR) $(DESTDIR).tar
+
+install-headers: subdirs
+	cp -R include/* $(DESTDIR)/usr/include
+
+install-kernel: subdirs
 
-install: $(SUBDIRS)
+install-modules: subdirs
-- 
cgit v1.2.3