From f798458e1d18fc8a866b49a4cfa0cb73536cbd41 Mon Sep 17 00:00:00 2001
From: Daniel Gustafsson <daniel@yesql.se>
Date: Wed, 23 Feb 2022 17:29:17 +0100
Subject: [PATCH] Disconnect help.auto.c from build-help in Makefile.

When there was an issue with the system library path during building, the build-help rule would fail during executing ./build-help with the effect that main.c wouldn't build.

Break out help.auto.c generation from the build-help stage to allow it to be re-executed when the library path has been corrected.
---
 doc/xml/release.xml | 11 +++++++++++
 src/Makefile.in     |  4 +++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/doc/xml/release.xml b/doc/xml/release.xml
index 0ff8b8d0f..8f5ac443e 100644
--- a/doc/xml/release.xml
+++ b/doc/xml/release.xml
@@ -125,6 +125,17 @@
                 </release-improvement-list>
 
                 <release-development-list>
+                    <release-item>
+                        <github-pull-request id="1672"/>
+
+                        <release-item-contributor-list>
+                            <release-item-ideator id="daniel.gustafsson"/>
+                            <release-item-contributor id="david.steele"/>
+                        </release-item-contributor-list>
+
+                        <p>Disconnect <file>help.auto.c</file> from <id>build-help</id> in <file>Makefile</file>.</p>
+                    </release-item>
+
                     <release-item>
                         <commit subject="Add read range to all storage drivers."/>
                         <commit subject="Implement restore ownership without updating manifest internals."/>
diff --git a/src/Makefile.in b/src/Makefile.in
index 107080c22..69060f645 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -249,6 +249,8 @@ OBJS_BUILD_HELP = $(patsubst %.c,$(BUILDDIR)/%.o,$(SRCS_BUILD) $(SRCS_BUILD_HELP
 
 build-help: $(OBJS_BUILD_HELP) build/config/config.yaml build/help/help.xml
 	$(CC) -o build-help $(OBJS_BUILD_HELP) $(LDFLAGS) $(LIBS) $(LIBS_BUILD)
+
+command/help/help.auto.c: build-help
 	./build-help $(VPATH)
 
 ####################################################################################################################################
@@ -284,7 +286,7 @@ clean-all: clean
 # Special per-object flags
 ####################################################################################################################################
 $(BUILDDIR)/postgres/interface/page.o: CFLAGS += @CFLAGS_PAGE_CHECKSUM@
-$(BUILDDIR)/main.o: build-help
+$(BUILDDIR)/main.o: command/help/help.auto.c
 
 ####################################################################################################################################
 # Compile and generate dependencies