CBIN variable is also pointless, it is always "instbin". Rather than

having two mysterious names, let's settle on one.

2 files changed, 24 insertions, 26 deletions

diff --git a/distrib/luna88k/ramdisk/Makefile b/distrib/luna88k/ramdisk/Makefile
index ecbd6691920..45a4bc11243 100644
--- a/distrib/luna88k/ramdisk/Makefile
+++ b/distrib/luna88k/ramdisk/Makefile
@@ -1,10 +1,9 @@
-#	$OpenBSD: Makefile,v 1.21 2019/04/28 15:15:39 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.22 2019/04/28 15:21:49 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
 .include "${TOP}/Makefile.inc"
 IMAGE=		mr.fs
-CBIN?=		instbin
 LISTS=		${.CURDIR}/list
 UTILS?=		${.CURDIR}/../../miniroot
 MTREE=		${UTILS}/mtree.conf
@@ -18,14 +17,14 @@ bsd.rd: ${IMAGE} bsd
 	cp bsd bsd.rd
 	rdsetroot bsd.rd ${IMAGE}
 
-${IMAGE}: ${CBIN}
+${IMAGE}: instbin
 	rm -rf $@.d
 	install -d -o root -g wheel $@.d
 	mtree -def ${MTREE} -p $@.d -u
 	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} REV=${REV} \
 	    TARGDIR=$@.d UTILS=${UTILS} RELEASEDIR=${RELEASEDIR} \
 	    sh ${UTILS}/runlist.sh ${LISTS}
-	rm $@.d/${CBIN}
+	rm $@.d/instbin
 	makefs ${MAKEFSARGS_RD} $@ $@.d
 
 bsd:
@@ -40,18 +39,18 @@ install:
 	cp bsd.rd ${RELEASEDIR}
 .endif
 
-${CBIN}.conf: ${LISTS}
-	awk -f ${UTILS}/makeconf.awk CBIN=${CBIN} ${LISTS} > ${CBIN}.conf
+instbin.conf: ${LISTS}
+	awk -f ${UTILS}/makeconf.awk  ${LISTS} > instbin.conf
 
-${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CBIN}.conf
-	crunchgen -E -D ${.CURDIR}/../../.. -L ${DESTDIR}/usr/lib ${CBIN}.conf
+instbin.mk instbin.cache instbin.c: instbin.conf
+	crunchgen -E -D ${.CURDIR}/../../.. -L ${DESTDIR}/usr/lib instbin.conf
 
-${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c
-	${MAKE} -f ${CBIN}.mk all
+instbin: instbin.mk instbin.cache instbin.c
+	${MAKE} -f instbin.mk all
 
 clean cleandir:
-	/bin/rm -f *.core ${IMAGE} ${CBIN} ${CBIN}.conf ${CBIN}.mk ${CBIN}.cache \
-	    lib*.a lib*.olist ${CBIN}.map *.o *.lo *.c bsd bsd.rd
+	/bin/rm -f *.core ${IMAGE} instbin instbin.conf instbin.mk instbin.cache \
+	    lib*.a lib*.olist instbin.map *.o *.lo *.c bsd bsd.rd
 	/bin/rm -rf ${IMAGE}.d
 
 .include <bsd.obj.mk>
diff --git a/distrib/luna88k/ramdisk/Makefile.inc b/distrib/luna88k/ramdisk/Makefile.inc
index 7b1e6062e8d..bff487c1bca 100644
--- a/distrib/luna88k/ramdisk/Makefile.inc
+++ b/distrib/luna88k/ramdisk/Makefile.inc
@@ -1,42 +1,41 @@
 #
-#	$OpenBSD: Makefile.inc,v 1.7 2013/11/29 12:35:47 aoyama Exp $
+#	$OpenBSD: Makefile.inc,v 1.8 2019/04/28 15:21:49 deraadt Exp $
 #
 
 # TOP is assumed to be defined by Makefile including this one.
 
-CBIN?=		instbin
 LISTS=		${.CURDIR}/list
 UTILS?=		${.CURDIR}/../../miniroot
 
 COMMONDIR=	${TOP}/ramdisk
 MOUNT_POINT?=	${TOP}/${BASE}/fs
 
-CRUNCHCONF?=	${COMMONDIR}/${CBIN}.conf
+CRUNCHCONF?=	${COMMONDIR}/instbin.conf
 MTREE=		${UTILS}/mtree.conf
 
-${CBIN}.conf: ${LISTS}
-	awk -f ${UTILS}/makeconf.awk CBIN=${CBIN} ${LISTS} > ${CBIN}.conf
+instbin.conf: ${LISTS}
+	awk -f ${UTILS}/makeconf.awk  ${LISTS} > instbin.conf
 
-${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CBIN}.conf
-	crunchgen -D ${BSDSRCDIR} -L ${DESTDIR}/usr/lib ${CBIN}.conf
+instbin.mk instbin.cache instbin.c: instbin.conf
+	crunchgen -D ${BSDSRCDIR} -L ${DESTDIR}/usr/lib instbin.conf
 
-${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c
-	${MAKE} -f ${CBIN}.mk all
+instbin: instbin.mk instbin.cache instbin.c
+	${MAKE} -f instbin.mk all
 
-#${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c
-#	${MAKE} -f ${CBIN}.mk SRCLIBDIR=${.CURDIR}/../../../lib all
+#instbin: instbin.mk instbin.cache instbin.c
+#	${MAKE} -f instbin.mk SRCLIBDIR=${.CURDIR}/../../../lib all
 
 do_files:
 	mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u
 	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
 	    REV=${REV} TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \
 	    RELEASEDIR=${RELEASEDIR} sh ${UTILS}/runlist.sh ${LISTS}
-	rm ${MOUNT_POINT}/${CBIN}
+	rm ${MOUNT_POINT}/instbin
 
 clean cleandir:
-	/bin/rm -f *.core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache \
+	/bin/rm -f *.core ${IMAGE} instbin instbin.mk instbin.cache \
 	    *.o *.lo *.c \
-	    lib*.a lib*.olist ${CBIN}.map
+	    lib*.a lib*.olist instbin.map
 
 .include <bsd.obj.mk>
 .include <bsd.subdir.mk>