From 5319c577ebc17290fcf9c9e0d4b34c282b6f5ac7 Mon Sep 17 00:00:00 2001
From: CyberLeo <cyberleo@cyberleo.net>
Date: Sat, 16 Oct 2010 22:21:45 -0500
Subject: [PATCH] script/makepkg: rework variables to mesh with
 makeworld-generated structures

---
 script/makepkg | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/script/makepkg b/script/makepkg
index 9e0c13a..e5abcb3 100755
--- a/script/makepkg
+++ b/script/makepkg
@@ -313,20 +313,28 @@ chport() {
 #
 ########
 
+TARGET="i386"
+CONFIG="GENERIC"
+
+ROOT="$(realpath "$(dirname "${0}")/../worlds")"
+
 # Base directory for everything
-base_dir="$(realpath "$(dirname "${0}")/../worlds")"
+base_dir="${ROOT}/${TARGET}/${CONFIG}"
+
+# Root tree for chroot seeding
+root_dir="${base_dir}/root"
 
-# Directory where distfiles will be stored between builds
-dist_dir="${base_dir}/distfiles"
+# Directory where distfiles will be stored between builds (common to all configs)
+dist_dir="${ROOT}/seed/distfiles"
 
 # Final directory for built packages (Outside chroot)
 final_pkg_dir="${base_dir}/pkg"
 final_bdeps_dir="${base_dir}/bdeps"
 
 # Chroot directory
-chroot_dir="${base_dir}/root"
+chroot_dir="${base_dir}/chroot"
 
-# Package directories, must be under ${chroot_dir}
+# Package directories (must be under ${chroot_dir})
 pkg_dir="${chroot_dir}/pkg"
 bdeps_dir="${pkg_dir}/bdeps"
 
-- 
2.42.0