From d31b899fd7771ecdf4aa8ef67dcc5c71f4468c8a Mon Sep 17 00:00:00 2001
From: CyberLeo <cyberleo@cyberleo.net>
Date: Sun, 8 May 2011 08:57:17 -0500
Subject: [PATCH] Makefile: rename variable image_sect to cardsize; default
 arch to current arch and conf to GENERIC

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

diff --git a/Makefile b/Makefile
index 64759af..f595240 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,14 @@
+# Defaults
+my_arch     != uname -m
+
 # Settables
-arch        ?= amd64
-conf        ?= SS4200
+arch        ?= $(my_arch)
+conf        ?= GENERIC
 target      ?= targets/$(arch)/$(conf)
 srctree     ?= $(target)/world
 worktree    ?= $(target)/tree
 boot_pad    ?= 1280
-image_sect  ?= 524288
+cardsize    ?= 524288
 
 # Generation scripts
 gentree      = script/gentree
@@ -54,7 +57,7 @@ push:
 # Generate components
 $(worktree)/card.img: $(worktree)/boot.img $(worktree)/root.img
 	$(checkroot)
-	${gencard} -b $(worktree)/boot.img -r $(worktree)/root.img -c $(worktree)/conf -s ${image_sect} -o $(worktree)/card.img
+	${gencard} -b $(worktree)/boot.img -r $(worktree)/root.img -c $(worktree)/conf -s ${cardsize} -o $(worktree)/card.img
 	@printf " \033[1;32m*\033[0m Complete\n"
 
 $(worktree)/boot.img: $(worktree)/boot
-- 
2.45.0