add no-docs option

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/21240)

diff --git a/.github/workflows/run-checker-daily.yml b/.github/workflows/run-checker-daily.yml
index db1f3dfbcba4d33180de88d65f8520b842b7fa6d..d97f3f2ee0116cba2b121d69a27cdd801e6a2870 100644 (file)
--- a/.github/workflows/run-checker-daily.yml
+++ b/.github/workflows/run-checker-daily.yml
@@ -49,6 +49,7 @@ jobs:
           no-des,
           no-devcryptoeng,
           no-dh,
+          no-docs,
           no-dsa,
           no-dtls1,
           no-dtls1_2,

diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index c7989124bfbf6b988476548fc83121a25c51b018..881310cf0897615a9a4724c0984511d966ffa508 100644 (file)
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -512,7 +512,7 @@ LANG=C
 {- dependmagic('build_modules', 'Build the modules (i.e. providers and engines)'); -}: build_modules_nodep
 {- dependmagic('build_programs', 'Build the openssl executables and scripts'); -}: build_programs_nodep
 
-all: build_sw build_docs ## Build software and documentation
+all: build_sw {- "build_docs" if !$disabled{docs}; -} ## Build software and documentation
 
 ##@ Documentation
 build_generated_pods: $(GENERATED_PODS)
@@ -624,9 +624,9 @@ depend: Makefile
 # Install helper targets #############################################
 ##@ Installation
 
-install: install_sw install_ssldirs install_docs {- $disabled{fips} ? "" : "install_fips" -} ## Install software and documentation, create OpenSSL directories
+install: install_sw install_ssldirs {- "install_docs" if !$disabled{docs}; -} {- $disabled{fips} ? "" : "install_fips" -} ## Install software and documentation, create OpenSSL directories
 
-uninstall: uninstall_docs uninstall_sw {- $disabled{fips} ? "" : "uninstall_fips" -} ## Uninstall software and documentation
+uninstall: {- "uninstall_docs" if !$disabled{docs}; -} uninstall_sw {- $disabled{fips} ? "" : "uninstall_fips" -} ## Uninstall software and documentation
 
 install_sw: install_dev install_engines install_modules install_runtime ## Install just the software and libraries
 

diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
index c05d03f369ac521f065c6a570dee9ff3ff656d10..7fd87e81cf35124041e829a5624cfe76a7880e47 100644 (file)
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -436,7 +436,7 @@ build_all_generated: $(GENERATED_MANDATORY) $(GENERATED) build_docs
        @$(ECHO) "         then make will fail..."
        @{- output_on() if $disabled{makedepend}; "\@rem" -}
 
-all: build_sw build_docs
+all: build_sw {- "build_docs" if !$disabled{docs}; -}
 
 test: tests
 {- dependmagic('tests'); -}: build_programs_nodep build_modules_nodep copy-utils
@@ -453,9 +453,9 @@ list-tests:
        @$(ECHO) "Tests are not supported with your chosen Configure options"
        @{- output_on() if !$disabled{tests}; "\@rem" -}
 
-install: install_sw install_ssldirs install_docs {- $disabled{fips} ? "" : "install_fips" -}
+install: install_sw install_ssldirs {- "install_docs" if !$disabled{docs}; -} {- $disabled{fips} ? "" : "install_fips" -}
 
-uninstall: uninstall_docs uninstall_sw {- $disabled{fips} ? "" : "uninstall_fips" -}
+uninstall: {- "uninstall_docs" if !$disabled{docs}; -} uninstall_sw {- $disabled{fips} ? "" : "uninstall_fips" -}
 
 libclean:
        "$(PERL)" -e "map { m/(.*)\.dll$$/; unlink glob """{.,apps,test,fuzz}/$$1.*"""; } @ARGV" $(SHLIBS)

diff --git a/Configure b/Configure
index fbafe2b1035f6c8b7533c4a7d275003ffeebfe01..5e9e6bfd5c2a46d93cf9e4d0a621fb5069b7eb2a 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -441,6 +441,7 @@ my @disablables = (
     "devcryptoeng",
     "dgram",
     "dh",
+    "docs",
     "dsa",
     "dso",
     "dtls",

diff --git a/INSTALL.md b/INSTALL.md
index a5747aaec7ad9e70784ae569dae691e2370461bc..3a73e56ec6ee5f48b94630d38486f4ae54f0f5d3 100644 (file)
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -716,6 +716,10 @@ Don't build support for datagram based BIOs.
 
 Selecting this option will also force the disabling of DTLS.
 
+### no-docs
+
+Don't build and install documentation, i.e. manual pages in various forms.
+
 ### no-dso
 
 Don't build support for loading Dynamic Shared Objects (DSO)