Postgres Pro
Downloads
Home   >   mailing lists

Re: [PATCH] Support built control file in PGXS VPATH builds - Mailing list pgsql-hackers

From Peter Eisentraut
Subject Re: [PATCH] Support built control file in PGXS VPATH builds
Date
Msg-id f2b78e0a-29cf-aae9-be60-1536568064ea@2ndquadrant.com
Whole thread Raw
In response to [PATCH] Support built control file in PGXS VPATH builds  (Craig Ringer <craig@2ndquadrant.com>)
Responses Re: [PATCH] Support built control file in PGXS VPATH builds  (Craig Ringer <craig@2ndquadrant.com>)
List pgsql-hackers
Tree view 
On 2020-02-07 04:14, Craig Ringer wrote:
> The attached patch fixes this by having PGXS resolve
> $(EXTENSION).control along the VPATH.

Simpler patch:

diff --git a/src/makefiles/pgxs.mk b/src/makefiles/pgxs.mk
index 271e7eaba8..1cd750eecd 100644
--- a/src/makefiles/pgxs.mk
+++ b/src/makefiles/pgxs.mk
@@ -229,7 +229,7 @@ endif # MODULE_big
 
 install: all installdirs
 ifneq (,$(EXTENSION))
-    $(INSTALL_DATA) $(addprefix $(srcdir)/, $(addsuffix .control, $(EXTENSION))) '$(DESTDIR)$(datadir)/extension/'
+    $(INSTALL_DATA) $(call vpathsearch,$(addsuffix .control, $(EXTENSION))) '$(DESTDIR)$(datadir)/extension/'
 endif # EXTENSION
 ifneq (,$(DATA)$(DATA_built))
     $(INSTALL_DATA) $(addprefix $(srcdir)/, $(DATA)) $(DATA_built) '$(DESTDIR)$(datadir)/$(datamoduledir)/'

Does that work for you?

-- 
Peter Eisentraut              http://www.2ndQuadrant.com/
PostgreSQL Development, 24x7 Support, Remote DBA, Training & Services

pgsql-hackers by date:

Previous
From: Amit Kapila
Date:
Subject: Re: [HACKERS] Moving relation extension locks out of heavyweight lock manager
Next
From: Peter Eisentraut
Date:
Subject: Re: Improve handling of parameter differences in physical replication