3 files changed, 30 insertions, 5 deletions

diff --git a/tools/build/options/WITHOUT_UNIFIED_OBJDIR b/tools/build/options/WITHOUT_UNIFIED_OBJDIR
new file mode 100644
index 000000000000..355730c4a17e
--- /dev/null
+++ b/tools/build/options/WITHOUT_UNIFIED_OBJDIR
@@ -0,0 +1,15 @@
+.\" $FreeBSD$
+Set to use the historical object directory format for
+.Xr build 7
+targets.
+For native-builds and builds done directly in sub-directories the format of
+.Pa ${MAKEOBJDIRPREFIX}/${.CURDIR}
+is used,
+while for cross-builds
+.Pa ${MAKEOBJDIRPREFIX}/${TARGET}.${TARGET_ARCH}/${.CURDIR}
+is used.
+.Pp
+This option is transitional and will be removed before the 12.0 release,
+at which time
+.va WITH_UNIFIED_OBJDIR
+will be enabled permanently.
diff --git a/tools/build/options/WITH_UNIFIED_OBJDIR b/tools/build/options/WITH_UNIFIED_OBJDIR
new file mode 100644
index 000000000000..6efc01d09c5e
--- /dev/null
+++ b/tools/build/options/WITH_UNIFIED_OBJDIR
@@ -0,0 +1,12 @@
+.\" $FreeBSD$
+Set to use the unified object directory format for
+.Xr build 7
+targets.
+For cross-builds, native-builds, and sub-directory builds, the format of
+.Pa ${MAKEOBJDIRPREFIX}/${.CURDIR}/${TARGET}.${TARGET_ARCH}
+is used.
+.Pp
+This option is transitional and will be removed before the 12.0 release,
+at which time
+.va WITH_UNIFIED_OBJDIR
+will be enabled permanently.
diff --git a/tools/build/options/makeman b/tools/build/options/makeman
index 6bcc7104dc48..c59c7179a856 100755
--- a/tools/build/options/makeman
+++ b/tools/build/options/makeman
@@ -217,12 +217,10 @@ variable, which defaults to
 Some examples that may only be set in this file are
 .Va WITH_DIRDEPS_BUILD ,
 and
-.Va WITH_META_MODE
-as they are environment-only variables.
-Note that
+.Va WITH_META_MODE ,
+and
 .Va MAKEOBJDIRPREFIX
-may be set here only when using
-.Va WITH_DIRDEPS_BUILD .
+as they are environment-only variables.
 .Pp
 The values of variables are ignored regardless of their setting;
 even if they would be set to