svn commit: r338758 - in head: etc usr.bin/locate/locate

[Brad Davis]

Author: brd
Date: Tue Sep 18 20:50:07 2018
New Revision: 338758
URL: https://svnweb.freebsd.org/changeset/base/338758

Log:
  Move install of locate.rc to usr.bin/locate/locate/
  
  This leverages CONFS to handle the install and purges an old comment.
  
  Approved by:	re (blanket, pkgbase), bapt (mentor)
  Differential Revision:	https://reviews.freebsd.org/D17215

Modified:
  head/etc/Makefile
  head/usr.bin/locate/locate/Makefile

Modified: head/etc/Makefile
==============================================================================
--- head/etc/Makefile	Tue Sep 18 20:47:06 2018	(r338757)
+++ head/etc/Makefile	Tue Sep 18 20:50:07 2018	(r338758)
@@ -26,10 +26,6 @@ BIN1=	\
 
 # NB: keep these sorted by MK_* knobs
 
-.if ${MK_LOCATE} != "no"
-BIN1+=	${SRCTOP}/usr.bin/locate/locate/locate.rc
-.endif
-
 .if ${MK_LPR} != "no"
 BIN1+=	hosts.lpd printcap
 .endif

Modified: head/usr.bin/locate/locate/Makefile
==============================================================================
--- head/usr.bin/locate/locate/Makefile	Tue Sep 18 20:47:06 2018	(r338757)
+++ head/usr.bin/locate/locate/Makefile	Tue Sep 18 20:50:07 2018	(r338758)
@@ -1,6 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
 # $FreeBSD$
 
+CONFS=	locate.rc
 PROG=	locate
 SRCS=	util.c locate.c
 CFLAGS+= -I${.CURDIR} -DMMAP # -DDEBUG (print time) -O2 (10% faster)
@@ -14,10 +15,6 @@ SCRIPTSDIR=	${LIBEXECDIR}
 SCRIPTSNAME_${script}=	locate.${script:R}
 .endfor
 MLINKS+= locate.updatedb.8 updatedb.8
-
-# only /usr/src/etc/Makefile install files in /etc
-#	${INSTALL} -o root -g wheel -m 644 \
-#		${.CURDIR}/locate.rc ${DESTDIR}/etc
 
 .include "../../Makefile.inc"
 .include <bsd.prog.mk>