Skip to content

Commit

Permalink
In followup to r340406, remove doc from the EXTRA_DISTRIBUTIONS
Browse files Browse the repository at this point in the history
list and remaining references from the script used to create the
MANIFEST file used by bsdinstall(8).

No MFC is planned at this time.

Sponsored by:	The FreeBSD Foundation
  • Loading branch information
gjb authored and gjb committed Nov 13, 2018
1 parent 4a1fa6c commit 46b3c8b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Makefile.inc1
Expand Up @@ -1287,7 +1287,7 @@ ITOOLS+=makewhatis
#

# Non-base distributions produced by the base system
EXTRA_DISTRIBUTIONS= doc
EXTRA_DISTRIBUTIONS=
.if defined(LIBCOMPAT)
EXTRA_DISTRIBUTIONS+= lib${libcompat}
.endif
Expand All @@ -1297,7 +1297,7 @@ EXTRA_DISTRIBUTIONS+= tests

DEBUG_DISTRIBUTIONS=
.if ${MK_DEBUG_FILES} != "no"
DEBUG_DISTRIBUTIONS+= base ${EXTRA_DISTRIBUTIONS:S,doc,,:S,tests,,}
DEBUG_DISTRIBUTIONS+= base ${EXTRA_DISTRIBUTIONS:S,tests,,}
.endif

MTREE_MAGIC?= mtree 2.0
Expand Down
3 changes: 0 additions & 3 deletions release/scripts/make-manifest.sh
Expand Up @@ -10,7 +10,6 @@
# $FreeBSD$

base="Base system"
doc="Additional Documentation"
kernel="Kernel"
ports="Ports tree"
src="System source tree"
Expand All @@ -19,7 +18,6 @@ tests="Test suite"

desc_base="${base} (MANDATORY)"
desc_base_dbg="${base} (Debugging)"
desc_doc="${doc}"
desc_kernel="${kernel} (MANDATORY)"
desc_kernel_dbg="${kernel} (Debugging)"
desc_kernel_alt="Alternate ${kernel}"
Expand All @@ -30,7 +28,6 @@ desc_ports="${ports}"
desc_src="${src}"
desc_tests="${tests}"

default_doc=off
default_src=off
default_ports=off
default_tests=off
Expand Down

0 comments on commit 46b3c8b

Please sign in to comment.