diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2016-05-21 01:31:54 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2016-05-21 01:31:54 +0000 |
| commit | 1193ee1f1f0424c388e0290ffc089dba9b5f4baf (patch) | |
| tree | a2c4c7eac42f1818da2bd736c657f29b4e9ec6ad | |
| parent | fde5f82005f8bb3ef79bba70d96c708d0da8647c (diff) | |
| download | FreeBSD-src-1193ee1f1f0424c388e0290ffc089dba9b5f4baf.zip FreeBSD-src-1193ee1f1f0424c388e0290ffc089dba9b5f4baf.tar.gz | |
WITH_META_MODE: Disable for 'make install' from top-level.
See r298220 for more explanation. We don't want to prevent installing
if a cookie exists for the install target.
Sponsored by: EMC / Isilon Storage Division
| -rw-r--r-- | share/mk/src.sys.env.mk | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/share/mk/src.sys.env.mk b/share/mk/src.sys.env.mk index 8911716..5620d1a 100644 --- a/share/mk/src.sys.env.mk +++ b/share/mk/src.sys.env.mk @@ -18,6 +18,13 @@ SRC_ENV_CONF?= /etc/src-env.conf _src_env_conf_included_: .NOTMAIN .endif +# Top-level installs should not use meta mode as it may prevent installing +# based on cookies. +.if make(*install*) && ${.MAKE.LEVEL} == 0 +META_MODE= normal +MK_META_MODE= no +.endif + # If we were found via .../share/mk we need to replace that # with ${.PARSEDIR:tA} so that we can be found by # sub-makes launched from objdir. |
