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

diff --git a/extensions/address_standardizer/Makefile.in b/extensions/address_standardizer/Makefile.in
index 3553b1423788a9c20fe383febafe61c43382b6f0..898abb3aca139719c6d8b00fa8146381a1765c0f 100644 (file)
--- 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 96c47591982e512357ed28bea5855aa0df28f79d..0fdef5244aab6250d6d9cc44ea5d109a2ae07386 100644 (file)
--- 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 06d3ff5d0f13d8c221c6bc990aabbbdca43705cd..ea44006c683629604e60ee59f1a7ebd7f07e6084 100644 (file)
--- 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 abfe5144ed2885f7262b4669b466a20ec8743b9c..4d375196c1535c664acc7a5485dc8bb02a42f932 100644 (file)
--- 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 fca56c9f7c5966e83b1f21a47b859a00466d791d..88af96def49e46a046e6d04a6494783720a640a7 100644 (file)
--- 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 47699594cdc97d5044bbb0f76dd6bf7b4c8622bf..6b8161f9a3f7bfa3c3fe9cb4252714212f542063 100644 (file)
--- 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@