From 33a56b04a61f8a5ee9cd7f73ce216c3a315fd3d5 Mon Sep 17 00:00:00 2001
From: deraadt <deraadt@openbsd.org>
Date: Tue, 22 Jul 2014 17:05:45 +0000
Subject: [PATCH] Repair two deep targets mistakenly called as afterinstall,
 rather than distribution. These would modify files in /etc, part of the base
 set, but still... that makes it harder to discern their sets placement.

---
 etc/Makefile                | 3 ++-
 usr.bin/mail/Makefile       | 8 +++-----
 usr.sbin/sliplogin/Makefile | 4 ++--
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/etc/Makefile b/etc/Makefile
index ef7702f5fd6..872e89f9d82 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.384 2014/07/16 19:08:54 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.385 2014/07/22 17:05:45 deraadt Exp $
 
 TZDIR=		/usr/share/zoneinfo
 LOCALTIME=	Canada/Mountain
@@ -217,6 +217,7 @@ distribution-etc-root-var: distrib-dirs
 	cd ../lib/libcrypto && exec ${MAKE} distribution
 	cd ../usr.bin/bgplg && exec ${MAKE} distribution
 	cd ../usr.bin/mail && exec ${MAKE} distribution
+	cd ../usr.sbin/sliplogin && exec ${MAKE} distribution
 	cd ../usr.sbin/ldapd && exec ${MAKE} distribution
 	cd ../usr.sbin/nginx && exec ${MAKE} -f Makefile.bsd-wrapper distribution
 	cd ../usr.sbin/npppd && exec ${MAKE} distribution
diff --git a/usr.bin/mail/Makefile b/usr.bin/mail/Makefile
index 7bbb5306add..9d08f890629 100644
--- a/usr.bin/mail/Makefile
+++ b/usr.bin/mail/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.9 2010/01/04 17:50:39 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.10 2014/07/22 17:05:45 deraadt Exp $
 
 PROG=	mail
 SRCS=	version.c aux.c cmd1.c cmd2.c cmd3.c cmdtab.c collect.c \
@@ -9,12 +9,10 @@ EFILES=	mail.rc
 LINKS=	${BINDIR}/mail ${BINDIR}/Mail ${BINDIR}/mail ${BINDIR}/mailx
 MLINKS=	mail.1 Mail.1 mail.1 mailx.1
 
-beforeinstall:
-	cd ${.CURDIR}/misc; ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} \
-	    -m 444 ${SFILES} ${DESTDIR}/usr/share/misc
-
 distribution:
 	cd ${.CURDIR}/misc; ${INSTALL} ${INSTALL_COPY} -o root -g wheel \
 	    -m 644 ${EFILES} ${DESTDIR}/etc
+	cd ${.CURDIR}/misc; ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} \
+	    -m 444 ${SFILES} ${DESTDIR}/usr/share/misc
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/sliplogin/Makefile b/usr.sbin/sliplogin/Makefile
index a13e3fd0cf4..7f08d16f759 100644
--- a/usr.sbin/sliplogin/Makefile
+++ b/usr.sbin/sliplogin/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.7 2013/04/16 06:16:26 jmc Exp $
+#	$OpenBSD: Makefile,v 1.8 2014/07/22 17:05:45 deraadt Exp $
 
 PROG=	sliplogin
 MAN=	sliplogin.8
@@ -11,7 +11,7 @@ BINMODE=4550
 
 .include <bsd.prog.mk>
 
-afterinstall:
+distribution:
 	@echo installing ${FILES}
 	@-for i in ${FILES}; do \
 		if [ ! -f ${DESTDIR}/etc/sliphome/$$i ]; then \
-- 
2.20.1