From ed74ab27a78c79aefdfec27bb69702c8cc1f8111 Mon Sep 17 00:00:00 2001
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Thu, 19 Nov 2015 17:57:31 +0000
Subject: [PATCH] Rename checked-in 'includes' to 'includes.sh' to avoid
 colliding with share/mk target 'make includes'.

The file is still installed to /usr/libexec/bsdconfig/includes/includes.

MFC after:	1 week
Sponsored by:	EMC / Isilon Storage Division
---
 usr.sbin/bsdconfig/includes/Makefile                  | 2 +-
 usr.sbin/bsdconfig/includes/{includes => includes.sh} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename usr.sbin/bsdconfig/includes/{includes => includes.sh} (100%)

diff --git a/usr.sbin/bsdconfig/includes/Makefile b/usr.sbin/bsdconfig/includes/Makefile
index 4717d34aaaf2..c0bd689229ea 100644
--- a/usr.sbin/bsdconfig/includes/Makefile
+++ b/usr.sbin/bsdconfig/includes/Makefile
@@ -8,6 +8,6 @@ FILESDIR=	${LIBEXECDIR}/bsdconfig/includes
 FILES=		INDEX USAGE
 
 SCRIPTSDIR=	${FILESDIR}
-SCRIPTS=	includes
+SCRIPTS=	includes.sh
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/bsdconfig/includes/includes b/usr.sbin/bsdconfig/includes/includes.sh
similarity index 100%
rename from usr.sbin/bsdconfig/includes/includes
rename to usr.sbin/bsdconfig/includes/includes.sh