From a7e3a390e11ea9601a0cd4a289b37f86751ba515 Mon Sep 17 00:00:00 2001
From: Andrew Dunstan <andrew@dunslane.net>
Date: Thu, 1 Jul 2021 14:51:54 -0400
Subject: [PATCH] Add new make targets world-bin and install-world-bin

These are the same as world and install-world respectively, but without
building or installing the documentation. There are many reasons for
wanting to be able to do this, including speed, lack of documentation
building tools, and wanting to build other formats of the documentation.
Plans for simplifying the buildfarm client code include using these
targets.

Backpatch to all live branches.

Discussion: https://postgr.es/m/6a421136-d462-b043-a8eb-e75b2861f3df@dunslane.net
---
 GNUmakefile.in                 | 10 ++++++++++
 doc/src/sgml/installation.sgml | 15 +++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 31e2efed8d..1fd7c362b4 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -23,6 +23,11 @@ world:
 # build src/ before contrib/
 world-contrib-recurse: world-src-recurse
 
+$(call recurse,world-bin,src config contrib,all)
+
+# build src/ before contrib/
+world-bin-contrib-recurse: world-bin-src-recurse
+
 html man:
 	$(MAKE) -C doc $@
 
@@ -39,6 +44,11 @@ install-world:
 # build src/ before contrib/
 install-world-contrib-recurse: install-world-src-recurse
 
+$(call recurse,install-world-bin,src config contrib,install)
+
+# build src/ before contrib/
+install-world-bin-contrib-recurse: install-world-bin-src-recurse
+
 $(call recurse,installdirs uninstall init-po update-po,doc src config)
 
 $(call recurse,distprep coverage,doc src config contrib)
diff --git a/doc/src/sgml/installation.sgml b/doc/src/sgml/installation.sgml
index a000ef0f90..c9c9be630d 100644
--- a/doc/src/sgml/installation.sgml
+++ b/doc/src/sgml/installation.sgml
@@ -1634,6 +1634,15 @@ All of PostgreSQL successfully made. Ready to install.
    The last line displayed should be:
 <screen>
 PostgreSQL, contrib, and documentation successfully made. Ready to install.
+</screen>
+   </para>
+
+  <para>
+   If you want to build everything that can be built, including the
+   additional modules (<filename>contrib</filename>), but without
+   the documentation, type instead:
+<screen>
+<userinput>make world-bin</userinput>
 </screen>
    </para>
 
@@ -1713,6 +1722,12 @@ build-postgresql:
     This also installs the documentation.
    </para>
 
+   <para>
+    If you built the world without the documentation above, type instead:
+<screen>
+<userinput>make install-world-bin</userinput>
+   </para>
+
    <para>
     You can use <literal>make install-strip</literal> instead of
     <literal>make install</literal> to strip the executable files and