From 7d4e1ddb8f1187b8f76641717f78f1d1965a6899 Mon Sep 17 00:00:00 2001
From: Fabian Keil <fk@fabiankeil.de>
Date: Wed, 10 Jun 2015 12:29:37 +0200
Subject: [PATCH 075/310] release/Makefile: Add ${DIST_TARBALL_DIR}

... which contains the distribution tarball directory on
the install media.

Obtained from: ElectroBSD
---
 release/Makefile | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/release/Makefile b/release/Makefile
index 1daf627d5a9b..b263d33744db 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -57,6 +57,9 @@ DISTDIR=	dist
 NO_ROOT=1
 .export NO_ROOT
 
+# Path to the distribution tarballs on the created installation media.
+DIST_TARBALL_DIR=usr/freebsd-dist
+
 # Define OSRELEASE by using newvars.sh
 .if !defined(OSRELEASE) || empty(OSRELEASE)
 .for _V in TYPE BRANCH REVISION
@@ -190,9 +193,9 @@ disc1: packagesystem
 	    MK_KERNEL_SYMBOLS=no MK_TESTS=no MK_DEBUG_FILES=no \
 	    -DDB_FROM_SRC
 # Copy distfiles
-	mkdir -p ${.TARGET}/usr/freebsd-dist
+	mkdir -p ${.TARGET}/${DIST_TARBALL_DIR}
 	for dist in MANIFEST $$(ls *.txz | grep -vE -- '(base|lib32)-dbg'); \
-	    do cp $${dist} ${.TARGET}/usr/freebsd-dist; \
+	    do cp $${dist} ${.TARGET}/${DIST_TARBALL_DIR}; \
 	done
 # Set up installation environment
 	ln -fs /tmp/bsdinstall_etc/resolv.conf ${.TARGET}/etc/resolv.conf
@@ -217,8 +220,9 @@ bootonly: packagesystem
 	    MK_KERNEL_SYMBOLS=no MK_TESTS=no MK_DEBUG_FILES=no \
 	    -DDB_FROM_SRC
 # Copy manifest only (no distfiles) to get checksums
-	mkdir -p ${.TARGET}/usr/freebsd-dist
-	cp MANIFEST ${.TARGET}/usr/freebsd-dist
+	mkdir -p ${.TARGET}/${DIST_TARBALL_DIR}
+	cp MANIFEST ${.TARGET}/${DIST_TARBALL_DIR}
+
 # Set up installation environment
 	ln -fs /tmp/bsdinstall_etc/resolv.conf ${.TARGET}/etc/resolv.conf
 	echo sendmail_enable=\"NONE\" > ${.TARGET}/etc/rc.conf
@@ -235,9 +239,9 @@ dvd: packagesystem
 		MK_TESTS=no MK_DEBUG_FILES=no \
 		-DDB_FROM_SRC
 # Copy distfiles
-	mkdir -p ${.TARGET}/usr/freebsd-dist
+	mkdir -p ${.TARGET}/${DIST_TARBALL_DIR}
 	for dist in MANIFEST $$(ls *.txz | grep -v -- '(base|lib32)-dbg'); \
-	    do cp $${dist} ${.TARGET}/usr/freebsd-dist; \
+	    do cp $${dist} ${.TARGET}/${DIST_TARBALL_DIR}; \
 	done
 # Set up installation environment
 	ln -fs /tmp/bsdinstall_etc/resolv.conf ${.TARGET}/etc/resolv.conf
-- 
2.37.1