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

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

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

diff --git a/release/Makefile b/release/Makefile
index a28ce1e98115..bc3b6076118e 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -60,6 +60,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
@@ -207,9 +210,9 @@ disc1: packagesystem
 		MK_DEBUG_FILES=no MK_LLDB=no \
 		MK_TOOLCHAIN=no
 # Copy distfiles
-	mkdir -p ${.TARGET}/usr/freebsd-dist
+	mkdir -p ${.TARGET}/${DIST_TARBALL_DIR}
 	for dist in MANIFEST $$(ls *.txz | grep -vE -- '(base|lib32|kernel)-dbg'); \
-	    do cp $${dist} ${.TARGET}/usr/freebsd-dist; \
+	    do cp $${dist} ${.TARGET}/${DIST_TARBALL_DIR}; \
 	done
 # Copy documentation, if generated
 .if !defined(NODOC)
@@ -236,8 +239,8 @@ bootonly: packagesystem
 	    MK_RESCUE=no MK_DICT=no \
 	    MK_KERNEL_SYMBOLS=no MK_TESTS=no MK_DEBUG_FILES=no
 # 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}
 # Copy documentation, if generated
 .if !defined(NODOC)
 	cp reldoc/* ${.TARGET}
@@ -256,9 +259,9 @@ dvd: packagesystem
 		DESTDIR=${.OBJDIR}/${.TARGET} MK_RESCUE=no MK_KERNEL_SYMBOLS=no \
 		MK_TESTS=no MK_DEBUG_FILES=no
 # 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
 # Copy documentation, if generated
 .if !defined(NODOC)
-- 
2.11.0