From 54fac0e50502765f66a9fad1ca8169b1cb75498e Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Mon, 29 Jan 2024 07:22:43 +0100 Subject: 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. --- src/Makefile.global.in | 2 -- src/backend/catalog/Makefile | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/Makefile.global.in b/src/Makefile.global.in index 6f7de20527c..8b3f8c24e08 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 352ba6d3e2e..196ecafc909 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' -- cgit v1.2.3