diff options
| author | imp <imp@FreeBSD.org> | 2014-05-06 04:22:01 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2014-05-06 04:22:01 +0000 |
| commit | 2118f42afd6189d38de35003e029021c0917f7e8 (patch) | |
| tree | feab560c7ac78d6da6d5e59636d346110d120bd7 /libexec | |
| parent | 726190bef76155e04b90d525e540ce41474dddd5 (diff) | |
| download | FreeBSD-src-2118f42afd6189d38de35003e029021c0917f7e8.zip FreeBSD-src-2118f42afd6189d38de35003e029021c0917f7e8.tar.gz | |
Use src.opts.mk in preference to bsd.own.mk except where we need stuff
from the latter.
Diffstat (limited to 'libexec')
| -rw-r--r-- | libexec/Makefile | 2 | ||||
| -rw-r--r-- | libexec/atf/atf-check/Makefile | 1 | ||||
| -rw-r--r-- | libexec/ftpd/Makefile | 2 | ||||
| -rw-r--r-- | libexec/rlogind/Makefile | 2 | ||||
| -rw-r--r-- | libexec/rtld-elf/Makefile | 2 | ||||
| -rw-r--r-- | libexec/tcpd/Makefile | 2 | ||||
| -rw-r--r-- | libexec/telnetd/Makefile | 2 |
7 files changed, 7 insertions, 6 deletions
diff --git a/libexec/Makefile b/libexec/Makefile index e087a8a..8a32694 100644 --- a/libexec/Makefile +++ b/libexec/Makefile @@ -1,7 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> SUBDIR= ${_atf} \ ${_atrun} \ diff --git a/libexec/atf/atf-check/Makefile b/libexec/atf/atf-check/Makefile index 0cfa863..093de06 100644 --- a/libexec/atf/atf-check/Makefile +++ b/libexec/atf/atf-check/Makefile @@ -25,6 +25,7 @@ # # $FreeBSD$ +.include <src.opts.mk> .include <bsd.init.mk> ATF= ${.CURDIR:H:H:H}/contrib/atf diff --git a/libexec/ftpd/Makefile b/libexec/ftpd/Makefile index e415407f..0c7c982 100644 --- a/libexec/ftpd/Makefile +++ b/libexec/ftpd/Makefile @@ -1,7 +1,7 @@ # @(#)Makefile 8.2 (Berkeley) 4/4/94 # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> PROG= ftpd MAN= ftpd.8 ftpchroot.5 diff --git a/libexec/rlogind/Makefile b/libexec/rlogind/Makefile index 9807dc8..de0fb20 100644 --- a/libexec/rlogind/Makefile +++ b/libexec/rlogind/Makefile @@ -1,7 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> PROG= rlogind MAN= rlogind.8 diff --git a/libexec/rtld-elf/Makefile b/libexec/rtld-elf/Makefile index 2a0953c..21e2219 100644 --- a/libexec/rtld-elf/Makefile +++ b/libexec/rtld-elf/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> MK_SSP= no PROG?= ld-elf.so.1 diff --git a/libexec/tcpd/Makefile b/libexec/tcpd/Makefile index e707a4e..f3fbf29 100644 --- a/libexec/tcpd/Makefile +++ b/libexec/tcpd/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.include <bsd.own.mk> +.include <src.opts.mk> .PATH: ${.CURDIR}/../../contrib/tcp_wrappers diff --git a/libexec/telnetd/Makefile b/libexec/telnetd/Makefile index dcc3398..99f023f 100644 --- a/libexec/telnetd/Makefile +++ b/libexec/telnetd/Makefile @@ -3,7 +3,7 @@ # Do not define -DKLUDGELINEMODE, as it does not interact well with many # telnet implementations. -.include <bsd.own.mk> +.include <src.opts.mk> TELNETDIR= ${.CURDIR}/../../contrib/telnet .PATH: ${TELNETDIR}/telnetd |
