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 /share/mk | |
| 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 'share/mk')
| -rw-r--r-- | share/mk/Makefile | 4 | ||||
| -rw-r--r-- | share/mk/bsd.opts.mk | 2 | ||||
| -rw-r--r-- | share/mk/bsd.own.mk | 5 | ||||
| -rw-r--r-- | share/mk/src.opts.mk | 5 |
4 files changed, 10 insertions, 6 deletions
diff --git a/share/mk/Makefile b/share/mk/Makefile index cd10215..f6f6e98 100644 --- a/share/mk/Makefile +++ b/share/mk/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ # @(#)Makefile 8.1 (Berkeley) 6/8/93 -.include <bsd.own.mk> +.include <src.opts.mk> FILES= \ bsd.README \ @@ -26,7 +26,7 @@ FILES= \ bsd.nls.mk \ bsd.obj.mk \ bsd.opts.mk \ - bsd.own.mk \ + src.opts.mk \ bsd.port.mk \ bsd.port.options.mk \ bsd.port.post.mk \ diff --git a/share/mk/bsd.opts.mk b/share/mk/bsd.opts.mk index 50c3092..09b607e 100644 --- a/share/mk/bsd.opts.mk +++ b/share/mk/bsd.opts.mk @@ -65,8 +65,6 @@ __DEFAULT_NO_OPTIONS = \ .include <bsd.mkopt.mk> -# This should be elsewhere, but needs to be here first for now. -.include <src.opts.mk> .endif # !_WITHOUT_SRCCONF .endif diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 3105cd6..952ca21 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -1,6 +1,6 @@ # $FreeBSD$ # -# The include file <bsd.own.mk> set common variables for owner, +# The include file <src.opts.mk> set common variables for owner, # group, mode, and directories. Defaults are in brackets. # # @@ -234,4 +234,7 @@ COMPRESS_EXT?= .gz # overriden by Makefiles, but the user may choose to set this in src.conf(5). TESTSBASE?= /usr/tests +# Compat for the moment +.include <bsd.compiler.mk> + .endif # !target(__<bsd.own.mk>__) diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index e8a6e00..2b0d41f 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -14,7 +14,7 @@ # Makefiles must include bsd.srcpot.mk before they test the value of any MK_FOO # variable. # -# Makefiles may also assume that this file is included by bsd.own.mk should it +# Makefiles may also assume that this file is included by src.opts.mk should it # need variables defined there prior to the end of the Makefile where # bsd.{subdir,lib.bin}.mk is traditionally included. # @@ -30,6 +30,9 @@ .if !target(__<src.opts.mk>__) __<src.opts.mk>__: +# Compat -- needed still? +.include <bsd.own.mk> + # Allow user to configure things, but in the future this will move # elsehwere... |
