From 54fac0e50502765f66a9fad1ca8169b1cb75498e Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <peter@eisentraut.org>
Date: Mon, 29 Jan 2024 07:22:43 +0100
Subject: [PATCH] Remove make function vpathsearch

This function served to support having prebuilt files in the source
tree for vpath builds.  This is no longer possible (since
721856ff24b); all built files are now always in the build tree.  The
invocations of this function are no longer required.
---
 doc/src/sgml/Makefile        | 10 +++++-----
 src/Makefile.global.in       |  2 --
 src/backend/catalog/Makefile |  4 ++--
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/doc/src/sgml/Makefile b/doc/src/sgml/Makefile
index 725fec59e7..9c9bbfe375 100644
--- a/doc/src/sgml/Makefile
+++ b/doc/src/sgml/Makefile
@@ -215,7 +215,7 @@ uninstall:
 ## Install html
 
 install-html: html installdirs
-	cp -R $(call vpathsearch,html) '$(DESTDIR)$(htmldir)'
+	cp -R html '$(DESTDIR)$(htmldir)'
 
 
 ## Install man
@@ -230,7 +230,7 @@ sqlmansectnum = $(shell expr X'$(sqlmansect)' : X'\([0-9]\)')
 #
 ifeq ($(sqlmansectnum),7)
 install-man:
-	cp -R $(foreach dir,man1 man3 man7,$(call vpathsearch,$(dir))) '$(DESTDIR)$(mandir)'
+	cp -R man1 man3 man7 '$(DESTDIR)$(mandir)'
 
 else # sqlmansectnum != 7
 fix_sqlmansectnum = sed -e '/^\.TH/s/"7"/"$(sqlmansect)"/' \
@@ -241,9 +241,9 @@ man: fixed-man-stamp
 
 fixed-man-stamp: man-stamp
 	@$(MKDIR_P) $(addprefix fixedman/,man1 man3 man$(sqlmansectnum))
-	for file in $(call vpathsearch,man1)/*.1; do $(fix_sqlmansectnum) $$file >fixedman/man1/`basename $$file` || exit; done
-	for file in $(call vpathsearch,man3)/*.3; do $(fix_sqlmansectnum) $$file >fixedman/man3/`basename $$file` || exit; done
-	for file in $(call vpathsearch,man7)/*.7; do $(fix_sqlmansectnum) $$file >fixedman/man$(sqlmansectnum)/`basename $$file | sed s/\.7$$/.$(sqlmansect)/` || exit; done
+	for file in man1/*.1; do $(fix_sqlmansectnum) $$file >fixedman/man1/`basename $$file` || exit; done
+	for file in man3/*.3; do $(fix_sqlmansectnum) $$file >fixedman/man3/`basename $$file` || exit; done
+	for file in man7/*.7; do $(fix_sqlmansectnum) $$file >fixedman/man$(sqlmansectnum)/`basename $$file | sed s/\.7$$/.$(sqlmansect)/` || exit; done
 
 install-man:
 	cp -R $(foreach dir,man1 man3 man$(sqlmansectnum),fixedman/$(dir)) '$(DESTDIR)$(mandir)'
diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index 6f7de20527..8b3f8c24e0 100644
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -76,8 +76,6 @@ VPATH = $(srcdir)
 endif
 endif # not PGXS
 
-vpathsearch = `for f in $(addsuffix /$(1),$(subst :, ,. $(VPATH))); do test -r $$f && echo $$f && break; done`
-
 
 ##########################################################################
 #
diff --git a/src/backend/catalog/Makefile b/src/backend/catalog/Makefile
index 352ba6d3e2..196ecafc90 100644
--- a/src/backend/catalog/Makefile
+++ b/src/backend/catalog/Makefile
@@ -183,8 +183,8 @@ $(top_builddir)/src/include/catalog/header-stamp: bki-stamp
 # Note: installation of generated headers is handled elsewhere
 .PHONY: install-data
 install-data: bki-stamp installdirs
-	$(INSTALL_DATA) $(call vpathsearch,postgres.bki) '$(DESTDIR)$(datadir)/postgres.bki'
-	$(INSTALL_DATA) $(call vpathsearch,system_constraints.sql) '$(DESTDIR)$(datadir)/system_constraints.sql'
+	$(INSTALL_DATA) postgres.bki '$(DESTDIR)$(datadir)/postgres.bki'
+	$(INSTALL_DATA) system_constraints.sql '$(DESTDIR)$(datadir)/system_constraints.sql'
 	$(INSTALL_DATA) $(srcdir)/system_functions.sql '$(DESTDIR)$(datadir)/system_functions.sql'
 	$(INSTALL_DATA) $(srcdir)/system_views.sql '$(DESTDIR)$(datadir)/system_views.sql'
 	$(INSTALL_DATA) $(srcdir)/information_schema.sql '$(DESTDIR)$(datadir)/information_schema.sql'