Author: bdrewery
Date: Wed Sep 23 23:30:57 2015
New Revision: 288159
URL: https://svnweb.freebsd.org/changeset/base/288159
Log:
RELDIR is useful without META_MODE. Always define it.
It is the CURDIR without the SRC base location in it.
Sponsored by: EMC / Isilon Storage Division
Modified:
head/share/mk/local.meta.sys.mk
head/share/mk/src.sys.env.mk
Modified: head/share/mk/local.meta.sys.mk
==============================================================================
--- head/share/mk/local.meta.sys.mk Wed Sep 23 23:20:49 2015
(r288158)
+++ head/share/mk/local.meta.sys.mk Wed Sep 23 23:30:57 2015
(r288159)
@@ -112,12 +112,6 @@ OBJTOP:= ${OBJROOT}${TARGET_OBJ_SPEC}
.endif
.endif
-.if ${.CURDIR} == ${SRCTOP}
-RELDIR = .
-.elif ${.CURDIR:M${SRCTOP}/*}
-RELDIR := ${.CURDIR:S,${SRCTOP}/,,}
-.endif
-
HOST_OBJTOP ?= ${OBJROOT}${HOST_TARGET}
.if ${OBJTOP} == ${HOST_OBJTOP} || ${REQUESTED_MACHINE:U${MACHINE}} == "host"
Modified: head/share/mk/src.sys.env.mk
==============================================================================
--- head/share/mk/src.sys.env.mk Wed Sep 23 23:20:49 2015
(r288158)
+++ head/share/mk/src.sys.env.mk Wed Sep 23 23:30:57 2015
(r288159)
@@ -5,6 +5,12 @@
# make sure this is defined in a consistent manner
SRCTOP:= ${.PARSEDIR:tA:H:H}
+.if ${.CURDIR} == ${SRCTOP}
+RELDIR = .
+.elif ${.CURDIR:M${SRCTOP}/*}
+RELDIR := ${.CURDIR:S,${SRCTOP}/,,}
+.endif
+
# site customizations that do not depend on anything!
SRC_ENV_CONF?= /etc/src-env.conf
.if !empty(SRC_ENV_CONF) && !target(_src_env_conf_included_)
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
