7 files changed, 19 insertions, 43 deletions
diff --git a/distrib/sparc64/bsd.rd/Makefile b/distrib/sparc64/bsd.rd/Makefile
index 43ddbf3831a..dc273a23f87 100644
--- a/distrib/sparc64/bsd.rd/Makefile
+++ b/distrib/sparc64/bsd.rd/Makefile
@@ -1,11 +1,8 @@
-#	$OpenBSD: Makefile,v 1.41 2019/04/29 01:48:41 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.42 2019/04/29 15:56:26 deraadt Exp $
 
-TOP=		${.CURDIR}/..
-
-.include "${TOP}/Makefile.inc"
 IMAGE=		ramdisk${OSrev}.fs
 LISTS?=		${.CURDIR}/list
-UTILS?=		${TOP}/../miniroot
+UTILS?=		${.CURDIR}/../../miniroot
 
 STRIPOPTS?=	-R .SUNW_ctf
 MTREE=		${UTILS}/mtree.conf
@@ -33,7 +30,7 @@ ${IMAGE}: instbin
 	rm -rf $@.d
 	install -d -o root -g wheel $@.d
 	mtree -def ${MTREE} -p $@.d -u
-	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} OSrev=${OSrev} \
+	CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} OSrev=${OSrev} \
 	    TARGDIR=$@.d UTILS=${UTILS} RELEASEDIR=${RELEASEDIR} \
 	    sh ${UTILS}/runlist.sh ${LISTS}
 	rm $@.d/instbin
diff --git a/distrib/sparc64/cdfs/Makefile b/distrib/sparc64/cdfs/Makefile
index 6bee54bbb06..ce6ed00fb66 100644
--- a/distrib/sparc64/cdfs/Makefile
+++ b/distrib/sparc64/cdfs/Makefile
@@ -1,8 +1,4 @@
-#	$OpenBSD: Makefile,v 1.18 2019/04/29 01:48:41 deraadt Exp $
-
-TOP=	${.CURDIR}/..
-
-.include "${TOP}/Makefile.inc"
+#	$OpenBSD: Makefile,v 1.19 2019/04/29 15:56:26 deraadt Exp $
 
 CDROM=	cd${OSrev}.iso
 
diff --git a/distrib/sparc64/common/Makefile.inc b/distrib/sparc64/common/Makefile.inc
index 87479a77ccc..7737793abdc 100644
--- a/distrib/sparc64/common/Makefile.inc
+++ b/distrib/sparc64/common/Makefile.inc
@@ -1,8 +1,5 @@
-#	$OpenBSD: Makefile.inc,v 1.22 2019/04/29 01:48:41 deraadt Exp $
+#	$OpenBSD: Makefile.inc,v 1.23 2019/04/29 15:56:26 deraadt Exp $
 
-TOP=		${.CURDIR}/..
-
-.include "${TOP}/Makefile.inc"
 IMAGE=		mr.fs
 CRUNCHCONF?=    ${.CURDIR}/../common/instbin.conf
 LISTS?=		${.CURDIR}/list
@@ -26,7 +23,7 @@ ${FS}:	bsd.rd
 	disklabel -w `cat vnd` ${FLOPPYTYPE}
 	newfs -m 0 -o space -i 524288 -c ${FLOPPYSIZE} /dev/r`cat vnd`a
 	mount /dev/`cat vnd`a ${MOUNT_POINT}
-	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
+	CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
 	    TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \
 	    RELEASEDIR=${RELEASEDIR} sh ${UTILS}/runlist.sh ${LISTFLOPPY}
 	installboot -v `cat vnd`
@@ -78,9 +75,9 @@ instbin: instbin.mk instbin.cache instbin.c
 
 do_files:
 	mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u
-	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
-	    OSrev=${OSrev} TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \
-	    RELEASEDIR=${RELEASEDIR} sh ${UTILS}/runlist.sh ${LISTS}
+	CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} OSrev=${OSrev} \
+	    TARGDIR=${MOUNT_POINT} UTILS=${UTILS} RELEASEDIR=${RELEASEDIR} \
+	    sh ${UTILS}/runlist.sh ${LISTS}
 	rm ${MOUNT_POINT}/instbin
 
 clean cleandir:
diff --git a/distrib/sparc64/iso/Makefile b/distrib/sparc64/iso/Makefile
index 59ef6aeacb4..55945ebd099 100644
--- a/distrib/sparc64/iso/Makefile
+++ b/distrib/sparc64/iso/Makefile
@@ -1,8 +1,4 @@
-#	$OpenBSD: Makefile,v 1.18 2019/04/29 01:48:41 deraadt Exp $
-
-TOP=	${.CURDIR}/..
-
-.include "${TOP}/Makefile.inc"
+#	$OpenBSD: Makefile,v 1.19 2019/04/29 15:56:26 deraadt Exp $
 
 CDROM=		install${OSrev}.iso
 RELXDIR?=	/home/relx-${MACHINE}
diff --git a/distrib/sparc64/miniroot/Makefile b/distrib/sparc64/miniroot/Makefile
index 234254a0dae..047d61d77f4 100644
--- a/distrib/sparc64/miniroot/Makefile
+++ b/distrib/sparc64/miniroot/Makefile
@@ -1,8 +1,4 @@
-#	$OpenBSD: Makefile,v 1.11 2019/04/29 01:48:41 deraadt Exp $
-
-TOP=	${.CURDIR}/..
-
-.include "${TOP}/Makefile.inc"
+#	$OpenBSD: Makefile,v 1.12 2019/04/29 15:56:26 deraadt Exp $
 
 TARGET=		miniroot${OSrev}.fs
 MOUNT_POINT=	/mnt
diff --git a/distrib/sparc64/ramdisk/Makefile b/distrib/sparc64/ramdisk/Makefile
index ffb76ae02be..2e8558445dd 100644
--- a/distrib/sparc64/ramdisk/Makefile
+++ b/distrib/sparc64/ramdisk/Makefile
@@ -1,8 +1,5 @@
-#	$OpenBSD: Makefile,v 1.44 2019/04/29 01:48:41 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.45 2019/04/29 15:56:26 deraadt Exp $
 
-TOP=		${.CURDIR}/..
-
-.include "${TOP}/Makefile.inc"
 IMAGE=		mr.fs
 LISTS=		${.CURDIR}/list
 UTILS?=		${.CURDIR}/../../miniroot
@@ -52,7 +49,7 @@ ${IMAGE}: instbin
 	rm -rf $@.d
 	install -d -o root -g wheel $@.d
 	mtree -def ${MTREE} -p $@.d -u
-	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} OSrev=${OSrev} \
+	CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} OSrev=${OSrev} \
 	    TARGDIR=$@.d UTILS=${UTILS} RELEASEDIR=${RELEASEDIR} \
 	    sh ${UTILS}/runlist.sh ${LISTS}
 	rm $@.d/instbin
@@ -61,9 +58,9 @@ ${IMAGE}: instbin
 .endif
 
 bsd:
-	cd ${TOP}/../../sys/arch/sparc64/compile/RAMDISKU1 && \
+	cd ${.CURDIR}/../../../sys/arch/sparc64/compile/RAMDISKU1 && \
 	    su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && env ${MAKE}'
-	cp -p ${TOP}/../../sys/arch/sparc64/compile/RAMDISKU1/obj/bsd bsd
+	cp -p ${.CURDIR}/../../../sys/arch/sparc64/compile/RAMDISKU1/obj/bsd bsd
 
 unconfig:
 	-umount -f ${MOUNT_POINT}
diff --git a/distrib/sparc64/ramdiskB/Makefile b/distrib/sparc64/ramdiskB/Makefile
index 656d3303f86..27bb571f5c3 100644
--- a/distrib/sparc64/ramdiskB/Makefile
+++ b/distrib/sparc64/ramdiskB/Makefile
@@ -1,8 +1,5 @@
-#	$OpenBSD: Makefile,v 1.38 2019/04/29 01:48:41 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.39 2019/04/29 15:56:26 deraadt Exp $
 
-TOP=		${.CURDIR}/..
-
-.include "${TOP}/Makefile.inc"
 IMAGE=		mr.fs
 LISTS=		${.CURDIR}/list
 UTILS?=		${.CURDIR}/../../miniroot
@@ -52,7 +49,7 @@ ${IMAGE}: instbin
 	rm -rf $@.d
 	install -d -o root -g wheel $@.d
 	mtree -def ${MTREE} -p $@.d -u
-	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} OSrev=${OSrev} \
+	CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} OSrev=${OSrev} \
 	    TARGDIR=$@.d UTILS=${UTILS} RELEASEDIR=${RELEASEDIR} \
 	    sh ${UTILS}/runlist.sh ${LISTS}
 	rm $@.d/instbin
@@ -61,9 +58,9 @@ ${IMAGE}: instbin
 .endif
 
 bsd:
-	cd ${TOP}/../../sys/arch/sparc64/compile/RAMDISKU5 && \
+	cd ${.CURDIR}/../../../sys/arch/sparc64/compile/RAMDISKU5 && \
 	    su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && ${MAKE}'
-	cp -p ${TOP}/../../sys/arch/sparc64/compile/RAMDISKU5/obj/bsd bsd
+	cp -p ${.CURDIR}/../../../sys/arch/sparc64/compile/RAMDISKU5/obj/bsd bsd
 
 unconfig:
 	-umount -f ${MOUNT_POINT}