svn commit: r340407 - in head: . release/scripts

[Glen Barber]

Author: gjb
Date: Tue Nov 13 19:53:02 2018
New Revision: 340407
URL: https://svnweb.freebsd.org/changeset/base/340407

Log:
  In followup to r340406, remove doc from the EXTRA_DISTRIBUTIONS
  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

Modified:
  head/Makefile.inc1
  head/release/scripts/make-manifest.sh

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Tue Nov 13 19:51:22 2018	(r340406)
+++ head/Makefile.inc1	Tue Nov 13 19:53:02 2018	(r340407)
@@ -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
@@ -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

Modified: head/release/scripts/make-manifest.sh
==============================================================================
--- head/release/scripts/make-manifest.sh	Tue Nov 13 19:51:22 2018	(r340406)
+++ head/release/scripts/make-manifest.sh	Tue Nov 13 19:53:02 2018	(r340407)
@@ -10,7 +10,6 @@
 # $FreeBSD$
 
 base="Base system"
-doc="Additional Documentation"
 kernel="Kernel"
 ports="Ports tree"
 src="System source tree"
@@ -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}"
@@ -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