From 6323d1adb53030d8aec8ab30841b1134c073b1a8 Mon Sep 17 00:00:00 2001
From: rin <rin@NetBSD.org>
Date: Wed, 8 Feb 2017 23:16:41 +0000
Subject: [PATCH] Rename sbin/ifconfig/Makefile.inc to Makefile.common; the
 former can potentially conflict with bsd.subdir.mk.

---
 distrib/utils/x_ifconfig/Makefile               | 4 ++--
 sbin/ifconfig/Makefile                          | 4 ++--
 sbin/ifconfig/{Makefile.inc => Makefile.common} | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename sbin/ifconfig/{Makefile.inc => Makefile.common} (87%)

diff --git a/distrib/utils/x_ifconfig/Makefile b/distrib/utils/x_ifconfig/Makefile
index e7bfcb83b6cc..21db39fe82ab 100644
--- a/distrib/utils/x_ifconfig/Makefile
+++ b/distrib/utils/x_ifconfig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2017/02/07 16:49:40 rin Exp $
+# $NetBSD: Makefile,v 1.35 2017/02/08 23:16:41 rin Exp $
 # Build a smaller ifconfig (i.e. for boot media)
 
 NOMAN=	# defined
@@ -19,7 +19,7 @@ CPPFLAGS+=-DSMALL
 .endif
 
 PROG=	ifconfig
-.include "${.CURDIR}/../../../sbin/ifconfig/Makefile.inc"
+.include "${.CURDIR}/../../../sbin/ifconfig/Makefile.common"
 
 .include <bsd.prog.mk>
 
diff --git a/sbin/ifconfig/Makefile b/sbin/ifconfig/Makefile
index c35f7b05f5fb..03bf527b1a31 100644
--- a/sbin/ifconfig/Makefile
+++ b/sbin/ifconfig/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.57 2017/02/08 23:14:00 rin Exp $
+#	$NetBSD: Makefile,v 1.58 2017/02/08 23:16:41 rin Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/5/93
 
 # when making a change to this file, please check if the change is
@@ -17,7 +17,7 @@ CPPFLAGS+=	-DINET6
 SRCS+= af_inet6.c
 .endif
 
-.include "Makefile.inc"
+.include "Makefile.common"
 
 .PATH:		${.CURDIR}/../../lib/libc/net
 RUMPSRCS= getifaddrs.c getnameinfo.c if_indextoname.c
diff --git a/sbin/ifconfig/Makefile.inc b/sbin/ifconfig/Makefile.common
similarity index 87%
rename from sbin/ifconfig/Makefile.inc
rename to sbin/ifconfig/Makefile.common
index 60245ae88c7e..7cd77efdf37f 100644
--- a/sbin/ifconfig/Makefile.inc
+++ b/sbin/ifconfig/Makefile.common
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.9 2012/10/31 10:17:34 msaitoh Exp $
+#	$NetBSD: Makefile.common,v 1.1 2017/02/08 23:16:41 rin Exp $
 
 # shared stuff with src/distrib/utils/x_ifconfig for install media.
 # stuff not required by install media should be into Makefile.