From 46783b12e38e8c81ed2dea94a925ada0b8f58e6c Mon Sep 17 00:00:00 2001
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Tue, 25 Oct 2016 16:21:38 +0000
Subject: [PATCH] Allow building makefs(8) from another Makefile (such as one
 in a seperate directory hierarchy used to build tools). This boils down to
 replacing the use of ${.CURDIR} with either ${SRCDIR} or ${SRCTOP}. SRCDIR is
 defined as the directory in which the Makefile lives that bmake(1) is
 currently reading. Use SRCTOP when reaching outside of makefs's directory.

---
 usr.sbin/makefs/Makefile            | 20 +++++++++++---------
 usr.sbin/makefs/cd9660/Makefile.inc |  4 ++--
 usr.sbin/makefs/ffs/Makefile.inc    |  4 ++--
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/usr.sbin/makefs/Makefile b/usr.sbin/makefs/Makefile
index 7a0ebf0d0cbb..a02458044d25 100644
--- a/usr.sbin/makefs/Makefile
+++ b/usr.sbin/makefs/Makefile
@@ -1,10 +1,12 @@
 #	$FreeBSD$
 
+SRCDIR:=${.PARSEDIR:tA}
+
 .include <src.opts.mk>
 
 PROG=	makefs
 
-CFLAGS+=-I${.CURDIR}
+CFLAGS+=-I${SRCDIR}
 
 SRCS=	cd9660.c ffs.c \
 	makefs.c \
@@ -14,24 +16,24 @@ MAN=	makefs.8
 
 WARNS?=	2
 
-.include "${.CURDIR}/cd9660/Makefile.inc"
-.include "${.CURDIR}/ffs/Makefile.inc"
+.include "${SRCDIR}/cd9660/Makefile.inc"
+.include "${SRCDIR}/ffs/Makefile.inc"
 
 CFLAGS+=-DHAVE_STRUCT_STAT_ST_FLAGS=1
 CFLAGS+=-DHAVE_STRUCT_STAT_ST_GEN=1
 
-.PATH: ${.CURDIR}/../../contrib/mtree
-CFLAGS+=-I${.CURDIR}/../../contrib/mtree
+.PATH: ${SRCTOP}/contrib/mtree
+CFLAGS+=-I${SRCTOP}/contrib/mtree
 SRCS+=	getid.c misc.c spec.c
 
-.PATH: ${.CURDIR}/../../contrib/mknod
-CFLAGS+=-I${.CURDIR}/../../contrib/mknod
+.PATH: ${SRCTOP}/contrib/mknod
+CFLAGS+=-I${SRCTOP}/contrib/mknod
 SRCS+=	pack_dev.c
 
-.PATH:	${.CURDIR}/../../sys/ufs/ffs
+.PATH:	${SRCTOP}/sys/ufs/ffs
 SRCS+=	ffs_tables.c
 
-CFLAGS+=	-I${.CURDIR}/../../lib/libnetbsd
+CFLAGS+=	-I${SRCTOP}/lib/libnetbsd
 LIBADD=		netbsd util sbuf
 
 .if ${MK_TESTS} != "no"
diff --git a/usr.sbin/makefs/cd9660/Makefile.inc b/usr.sbin/makefs/cd9660/Makefile.inc
index 1455fcddaca6..a04664ed4928 100644
--- a/usr.sbin/makefs/cd9660/Makefile.inc
+++ b/usr.sbin/makefs/cd9660/Makefile.inc
@@ -1,9 +1,9 @@
 #	$FreeBSD$
 #
 
-.PATH:	${.CURDIR}/cd9660 ${.CURDIR}/../../sys/fs/cd9660/
+.PATH:	${SRCDIR}/cd9660 ${SRCTOP}/sys/fs/cd9660/
 
-CFLAGS+=-I${.CURDIR}/../../sys/fs/cd9660/
+CFLAGS+=-I${SRCTOP}/sys/fs/cd9660/
 
 SRCS+=	cd9660_strings.c cd9660_debug.c cd9660_eltorito.c \
 	cd9660_write.c cd9660_conversion.c iso9660_rrip.c cd9660_archimedes.c
diff --git a/usr.sbin/makefs/ffs/Makefile.inc b/usr.sbin/makefs/ffs/Makefile.inc
index d681c4eff773..2e9f1921b43f 100644
--- a/usr.sbin/makefs/ffs/Makefile.inc
+++ b/usr.sbin/makefs/ffs/Makefile.inc
@@ -1,9 +1,9 @@
 #	$FreeBSD$
 #
 
-.PATH:	${.CURDIR}/ffs ${.CURDIR}/../../sys/ufs/ffs
+.PATH:	${SRCDIR}/ffs ${SRCTOP}/sys/ufs/ffs
 
-CFLAGS+=	-I${.CURDIR}/../../sys/ufs/ffs
+CFLAGS+=	-I${SRCTOP}/sys/ufs/ffs
 
 SRCS+=	ffs_alloc.c ffs_balloc.c ffs_bswap.c ffs_subr.c ufs_bmap.c
 SRCS+=	buf.c mkfs.c