From 1c6a5fe391b37e89f846807b12df5a54318e5ce8 Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Fri, 14 Sep 2018 13:55:25 +0000 Subject: [PATCH] Revert "Do not include PGXS from extensions Makefiles" This reverts r16792, it looks like install rule requires PGXS.. git-svn-id: http://svn.osgeo.org/postgis/trunk@16793 b70326c6-7e19-0410-871a-916f4a2858ee --- extensions/address_standardizer/Makefile.in | 4 ++++ extensions/postgis/Makefile.in | 4 ++++ extensions/postgis_raster/Makefile.in | 4 ++++ extensions/postgis_sfcgal/Makefile.in | 4 ++++ extensions/postgis_tiger_geocoder/Makefile.in | 4 ++++ extensions/postgis_topology/Makefile.in | 4 ++++ 6 files changed, 24 insertions(+) diff --git a/extensions/address_standardizer/Makefile.in b/extensions/address_standardizer/Makefile.in index 3553b1423..898abb3ac 100644 --- a/extensions/address_standardizer/Makefile.in +++ b/extensions/address_standardizer/Makefile.in @@ -188,3 +188,7 @@ EXTRA_CLEAN += sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--unpackaged- distclean: clean rm Makefile + +PGXS := @PGXS@ +include $(PGXS) +PERL = @PERL@ diff --git a/extensions/postgis/Makefile.in b/extensions/postgis/Makefile.in index 96c475919..0fdef5244 100644 --- a/extensions/postgis/Makefile.in +++ b/extensions/postgis/Makefile.in @@ -131,3 +131,7 @@ include ../upgrade-paths-rules.mk distclean: clean rm -f Makefile + +PGXS := $(shell $(PG_CONFIG) --pgxs) +include $(PGXS) +PERL = @PERL@ diff --git a/extensions/postgis_raster/Makefile.in b/extensions/postgis_raster/Makefile.in index 06d3ff5d0..ea44006c6 100644 --- a/extensions/postgis_raster/Makefile.in +++ b/extensions/postgis_raster/Makefile.in @@ -106,3 +106,7 @@ include ../upgrade-paths-rules.mk distclean: clean rm -f Makefile + +PGXS := $(shell $(PG_CONFIG) --pgxs) +include $(PGXS) +PERL = @PERL@ diff --git a/extensions/postgis_sfcgal/Makefile.in b/extensions/postgis_sfcgal/Makefile.in index abfe5144e..4d375196c 100644 --- a/extensions/postgis_sfcgal/Makefile.in +++ b/extensions/postgis_sfcgal/Makefile.in @@ -107,3 +107,7 @@ include ../upgrade-paths-rules.mk distclean: clean rm Makefile + +PGXS := $(shell $(PG_CONFIG) --pgxs) +include $(PGXS) +PERL = @PERL@ diff --git a/extensions/postgis_tiger_geocoder/Makefile.in b/extensions/postgis_tiger_geocoder/Makefile.in index fca56c9f7..88af96def 100644 --- a/extensions/postgis_tiger_geocoder/Makefile.in +++ b/extensions/postgis_tiger_geocoder/Makefile.in @@ -248,3 +248,7 @@ EXTRA_CLEAN += $(wildcard expected/*--*.out) distclean: clean rm Makefile + +PGXS := $(shell $(PG_CONFIG) --pgxs) +include $(PGXS) +PERL=@PERL@ diff --git a/extensions/postgis_topology/Makefile.in b/extensions/postgis_topology/Makefile.in index 47699594c..6b8161f9a 100644 --- a/extensions/postgis_topology/Makefile.in +++ b/extensions/postgis_topology/Makefile.in @@ -94,3 +94,7 @@ include ../upgrade-paths-rules.mk distclean: clean rm Makefile + +PGXS := $(shell $(PG_CONFIG) --pgxs) +include $(PGXS) +PERL=@PERL@ -- 2.40.0