From 2118f42afd6189d38de35003e029021c0917f7e8 Mon Sep 17 00:00:00 2001
From: imp <imp@FreeBSD.org>
Date: Tue, 6 May 2014 04:22:01 +0000
Subject: Use src.opts.mk in preference to bsd.own.mk except where we need
 stuff from the latter.

---
 bin/Makefile       | 2 +-
 bin/Makefile.inc   | 2 +-
 bin/csh/Makefile   | 2 +-
 bin/date/Makefile  | 2 +-
 bin/ed/Makefile    | 2 +-
 bin/ls/Makefile    | 2 +-
 bin/mv/Makefile    | 2 +-
 bin/pax/Makefile   | 2 +-
 bin/pkill/Makefile | 2 +-
 bin/sh/Makefile    | 2 +-
 bin/test/Makefile  | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'bin')

diff --git a/bin/Makefile b/bin/Makefile
index 63d96fe..ae509c4 100644
--- a/bin/Makefile
+++ b/bin/Makefile
@@ -1,7 +1,7 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 5/31/93
 # $FreeBSD$
 
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
 SUBDIR= cat \
 	chflags \
diff --git a/bin/Makefile.inc b/bin/Makefile.inc
index ec24a48..86141a1 100644
--- a/bin/Makefile.inc
+++ b/bin/Makefile.inc
@@ -1,7 +1,7 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 5/31/93
 # $FreeBSD$
 
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
 BINDIR?=	/bin
 WARNS?=		6
diff --git a/bin/csh/Makefile b/bin/csh/Makefile
index 1fa24a1..c8845f9 100644
--- a/bin/csh/Makefile
+++ b/bin/csh/Makefile
@@ -6,7 +6,7 @@
 #
 # To profile, put -DPROF in DEFS and -pg in CFLAGS, and recompile.
 
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
 TCSHDIR= ${.CURDIR}/../../contrib/tcsh
 .PATH: ${TCSHDIR}
diff --git a/bin/date/Makefile b/bin/date/Makefile
index 6da5848..56ce33a 100644
--- a/bin/date/Makefile
+++ b/bin/date/Makefile
@@ -1,7 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 # $FreeBSD$
 
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
 PROG=	date
 SRCS=	date.c netdate.c vary.c
diff --git a/bin/ed/Makefile b/bin/ed/Makefile
index 7c39e54..fb1c37d 100644
--- a/bin/ed/Makefile
+++ b/bin/ed/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
 PROG=	ed
 SRCS=	buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c
diff --git a/bin/ls/Makefile b/bin/ls/Makefile
index 4d02a7e..7149d91 100644
--- a/bin/ls/Makefile
+++ b/bin/ls/Makefile
@@ -1,7 +1,7 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/2/93
 # $FreeBSD$
 
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
 PROG=	ls
 SRCS=	cmp.c ls.c print.c util.c
diff --git a/bin/mv/Makefile b/bin/mv/Makefile
index ad8cc4f..02a5a48 100644
--- a/bin/mv/Makefile
+++ b/bin/mv/Makefile
@@ -1,7 +1,7 @@
 #	@(#)Makefile	8.2 (Berkeley) 4/2/94
 # $FreeBSD$
 
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
 PROG=	mv
 
diff --git a/bin/pax/Makefile b/bin/pax/Makefile
index 95f18bb..c00d52c 100644
--- a/bin/pax/Makefile
+++ b/bin/pax/Makefile
@@ -1,7 +1,7 @@
 #       @(#)Makefile	8.1 (Berkeley) 5/31/93
 # $FreeBSD$
 
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
 # To install on versions prior to BSD 4.4 the following may have to be
 # defined with CFLAGS +=
diff --git a/bin/pkill/Makefile b/bin/pkill/Makefile
index bb4d865..11bfbe3 100644
--- a/bin/pkill/Makefile
+++ b/bin/pkill/Makefile
@@ -1,7 +1,7 @@
 #	$NetBSD: Makefile,v 1.1 2002/03/01 11:21:58 ad Exp $
 # $FreeBSD$
 
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
 PROG=	pkill
 
diff --git a/bin/sh/Makefile b/bin/sh/Makefile
index e1ce5fe..6a982bc 100644
--- a/bin/sh/Makefile
+++ b/bin/sh/Makefile
@@ -1,7 +1,7 @@
 #	@(#)Makefile	8.4 (Berkeley) 5/5/95
 # $FreeBSD$
 
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
 PROG=	sh
 INSTALLFLAGS= -S
diff --git a/bin/test/Makefile b/bin/test/Makefile
index e9a0507..8e3121b 100644
--- a/bin/test/Makefile
+++ b/bin/test/Makefile
@@ -1,7 +1,7 @@
 #        @(#)Makefile	8.1 (Berkeley) 5/31/93
 # $FreeBSD$
 
-.include <bsd.own.mk>
+.include <src.opts.mk>
 
 PROG=	test
 LINKS=	${BINDIR}/test ${BINDIR}/[
-- 
cgit v1.1