From 144cd65bcac41bc3d623874eb86cde232fb9707f Mon Sep 17 00:00:00 2001
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Fri, 18 Sep 2015 21:18:44 +0000
Subject: [PATCH] Use FILES for installing the dtrace scripts.

The BSD.usr.dist mtree always creates /usr/lib/dtrace so there is no
need to check if it exists.

The FILES mechanism already supports LIBRARIES_ONLY.

Sponsored by:	EMC / Isilon Storage Division
---
 cddl/lib/libdtrace/Makefile | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/cddl/lib/libdtrace/Makefile b/cddl/lib/libdtrace/Makefile
index ee1d6dbb10ac..642357fca309 100644
--- a/cddl/lib/libdtrace/Makefile
+++ b/cddl/lib/libdtrace/Makefile
@@ -56,6 +56,10 @@ DSRCS=		errno.d			\
 		udp.d			\
 		unistd.d
 
+FILES=		${DSRCS}
+FILESDIR=	/usr/lib/dtrace
+FILESMODE=	${NOBINMODE}
+
 WARNS?=		1
 
 CFLAGS+=	-I${.OBJDIR} -I${.CURDIR} \
@@ -120,11 +124,4 @@ dt_names.c:
 
 beforedepend:	dt_errtags.c dt_names.c
 
-beforeinstall:
-.if !defined(LIBRARIES_ONLY) && exists(${DESTDIR}/usr/lib/dtrace)
-.for file in ${DSRCS}
-	${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} ${.CURDIR}/${file} ${DESTDIR}/usr/lib/dtrace
-.endfor
-.endif
-
 .include <bsd.lib.mk>