From 07e64b69ee629f64df1383cd21c9a71166a6aeef Mon Sep 17 00:00:00 2001
From: Sascha Wildner <saw@online.de>
Date: Sat, 28 Jul 2018 14:48:16 +0200
Subject: [PATCH] install(1): Fix building on release and older systems.

While here, add a comment about this to mtree(8)'s Makefile too.
---
 usr.bin/xinstall/Makefile | 10 ++++++++++
 usr.sbin/mtree/Makefile   |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/usr.bin/xinstall/Makefile b/usr.bin/xinstall/Makefile
index fc25684f91..47481e7b76 100644
--- a/usr.bin/xinstall/Makefile
+++ b/usr.bin/xinstall/Makefile
@@ -9,4 +9,14 @@ MAN=		install.1
 .PATH:          ${.CURDIR}/../../usr.sbin/mtree
 CFLAGS+=        -I${.CURDIR}/../../usr.sbin/mtree
 
+.if defined(BOOTSTRAPPING)
+.if ${WORLD_VERSION} < 500302 # pwcache(3) upgrades came in about here
+.PATH: ${.CURDIR}/../../lib/libc/gen
+SRCS+=	pwcache.c
+CFLAGS+=-I${.CURDIR}/../../lib/libc/include
+CFLAGS+=-include ${.CURDIR}/../../include/grp.h
+CFLAGS+=-include ${.CURDIR}/../../include/pwd.h
+.endif
+.endif
+
 .include <bsd.prog.mk>
diff --git a/usr.sbin/mtree/Makefile b/usr.sbin/mtree/Makefile
index 0b5cdd229f..56d1408676 100644
--- a/usr.sbin/mtree/Makefile
+++ b/usr.sbin/mtree/Makefile
@@ -23,7 +23,7 @@ CFLAGS+= 	-I${.CURDIR}/../../crypto/libressl/include
 CFLAGS+=	-I${.CURDIR}/../../sbin/md5
 .else
 CFLAGS+=-DNO_MD5 -DNO_SHA1 -DNO_SHA2 -DNO_RMD160
-.if ${WORLD_VERSION} < 500302
+.if ${WORLD_VERSION} < 500302 # pwcache(3)/vis(3) upgrades came in about here
 .PATH: ${.CURDIR}/../../lib/libc/gen
 SRCS+=	pwcache.c vis.c
 CFLAGS+=-I${.CURDIR}/../../lib/libc/include
-- 
2.11.4.GIT