Uniformize how PGXS is used

Closes #4250
Closes https://github.com/postgis/postgis/pull/341

git-svn-id: http://svn.osgeo.org/postgis/trunk@17044 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/doc/Makefile.comments.in b/doc/Makefile.comments.in
index ba507b9fbc5974ea0b1e2a03fa7e8f4a754cd8e0..a334c75eabc84345e34efbdec9bc1f5fd6c1808d 100644 (file)
--- a/doc/Makefile.comments.in
+++ b/doc/Makefile.comments.in
@@ -20,7 +20,7 @@ MODULEDIR=contrib/$(MODULE_doc)
 DATA_built=postgis_comments.sql raster_comments.sql topology_comments.sql sfcgal_comments.sql
 
 # PGXS information
-PG_CONFIG = @PG_CONFIG@ 
+PG_CONFIG := @PG_CONFIG@
 PGXS := @PGXS@
 include $(PGXS)
 

diff --git a/extensions/address_standardizer/Makefile.in b/extensions/address_standardizer/Makefile.in
index 90fa5f2c313474a0e9fa1cad7ce6dce8dc26244f..ae5ee5999b16ed8b687a86c50c3c046a79c2a2c1 100644 (file)
--- a/extensions/address_standardizer/Makefile.in
+++ b/extensions/address_standardizer/Makefile.in
@@ -56,10 +56,6 @@ SHLIB_LINK = @SHLIB_LINK@ -lpcre
 EXTRA_CLEAN = usps-st-city-name.txt mk-st-regexp mk-city-regex test_main
 REGRESS = test-init-extensions test-parseaddress test-standardize_address_1 test-standardize_address_2
 
-# PGXS information
-PG_CONFIG = @PG_CONFIG@
-
-PGVER := $(shell $(PG_CONFIG) --version)
 
 # Borrow the $libdir substitution from PGXS but customise by running the preprocessor
 # and adding the version number
@@ -184,6 +180,7 @@ EXTRA_CLEAN += sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--unpackaged-
 distclean: clean
        rm Makefile
 
+PG_CONFIG := @PG_CONFIG@
 PGXS := @PGXS@
 include $(PGXS)
 PERL = @PERL@

diff --git a/extensions/postgis/Makefile.in b/extensions/postgis/Makefile.in
index cab097cb6fac6ac4da246fae6f8f4fb995932d30..30a7cf129f2211684d8687435ee17b1a52d5b762 100644 (file)
--- a/extensions/postgis/Makefile.in
+++ b/extensions/postgis/Makefile.in
@@ -59,8 +59,6 @@ RASTER_DROP_SCRIPTS = \
        ../../raster/rt_pg/rtpostgis_drop.sql \
        ../../raster/rt_pg/uninstall_rtpostgis.sql
 
-PG_CONFIG    = @PG_CONFIG@
-
 SQL_BITS     = $(wildcard sql/*.sql)
 EXTRA_CLEAN += ${SQL_BITS} sql/*.sql
 
@@ -131,6 +129,7 @@ include ../upgrade-paths-rules.mk
 distclean: clean
        rm -f Makefile
 
-PGXS := $(shell $(PG_CONFIG) --pgxs)
+PG_CONFIG := @PG_CONFIG@
+PGXS := @PGXS@
 include $(PGXS)
 PERL = @PERL@

diff --git a/extensions/postgis_raster/Makefile.in b/extensions/postgis_raster/Makefile.in
index 0a726597e0d3c8045bec47ab174e874d1b230cd1..410948992fcbfabac3160b7104cbca0650cf7a69 100644 (file)
--- a/extensions/postgis_raster/Makefile.in
+++ b/extensions/postgis_raster/Makefile.in
@@ -51,8 +51,6 @@ EXTENSION_UPGRADE_SCRIPTS = \
 EXTENSION_UNPACKAGED_UPGRADE_SCRIPTS = \
        sql/rtpostgis.sql
 
-PG_CONFIG    = @PG_CONFIG@
-
 SQL_BITS     = $(wildcard sql/*.sql)
 EXTRA_CLEAN += ${SQL_BITS} sql/*.sql
 
@@ -109,6 +107,7 @@ include ../upgrade-paths-rules.mk
 distclean: clean
        rm -f Makefile
 
-PGXS := $(shell $(PG_CONFIG) --pgxs)
+PG_CONFIG := @PG_CONFIG@
+PGXS := @PGXS@
 include $(PGXS)
 PERL = @PERL@

diff --git a/extensions/postgis_sfcgal/Makefile.in b/extensions/postgis_sfcgal/Makefile.in
index 4fd33122b9958959c5cd8ada84aaa0e317fb083f..31e92404ffb623b4953326eccad9ebafa6863775 100644 (file)
--- a/extensions/postgis_sfcgal/Makefile.in
+++ b/extensions/postgis_sfcgal/Makefile.in
@@ -39,8 +39,6 @@ EXTENSION_UNPACKAGED_UPGRADE_SCRIPTS = \
        sql_bits/sfcgal.sql \
        ../../utils/create_unpackaged.pl
 
-PG_CONFIG    =  @PG_CONFIG@
-
 SQL_BITS     = $(wildcard sql_bits/*.sql)
 EXTRA_CLEAN += sql/*.sql ${SQL_BITS}
 
@@ -108,6 +106,7 @@ include ../upgrade-paths-rules.mk
 distclean: clean
        rm Makefile
 
-PGXS := $(shell $(PG_CONFIG) --pgxs)
+PG_CONFIG := @PG_CONFIG@
+PGXS := @PGXS@
 include $(PGXS)
 PERL = @PERL@

diff --git a/extensions/postgis_tiger_geocoder/Makefile.in b/extensions/postgis_tiger_geocoder/Makefile.in
index 83f9d93f1ba2c4ed4c612f99c409476351b4bc06..631627cce7c49808e58a307e49d3d49fdafbec17 100644 (file)
--- a/extensions/postgis_tiger_geocoder/Makefile.in
+++ b/extensions/postgis_tiger_geocoder/Makefile.in
@@ -31,8 +31,6 @@ DATA_built = \
 REGRESS = test-normalize_address test-upgrade
 REGRESS_OPTS = --load-extension=fuzzystrmatch --load-extension=postgis --load-extension=$(EXTENSION)
 
-PG_CONFIG    =  @PG_CONFIG@
-
 SQL_BITS     = $(wildcard sql_bits/*.sql)
 EXTRA_CLEAN += sql/*.sql ${SQL_BITS}
 
@@ -249,6 +247,7 @@ EXTRA_CLEAN += $(wildcard expected/*--*.out)
 distclean: clean
        rm Makefile
 
-PGXS := $(shell $(PG_CONFIG) --pgxs)
+PG_CONFIG := @PG_CONFIG@
+PGXS := @PGXS@
 include $(PGXS)
 PERL=@PERL@

diff --git a/extensions/postgis_topology/Makefile.in b/extensions/postgis_topology/Makefile.in
index ed9edac711660ed8ff2f63fbda0f5672a05267b7..feeea22e4541348aaea981cc3d79d55a2c2d5632 100644 (file)
--- a/extensions/postgis_topology/Makefile.in
+++ b/extensions/postgis_topology/Makefile.in
@@ -40,8 +40,6 @@ EXTENSION_UPGRADE_SCRIPTS = \
        sql_bits/topology_comments.sql \
        ../postgis_extension_helper_uninstall.sql
 
-PG_CONFIG    = @PG_CONFIG@
-
 SQL_BITS     = $(wildcard sql_bits/*.sql)
 EXTRA_CLEAN += sql/*.sql ${SQL_BITS}
 
@@ -99,6 +97,7 @@ include ../upgrade-paths-rules.mk
 distclean: clean
        rm Makefile
 
-PGXS := $(shell $(PG_CONFIG) --pgxs)
+PG_CONFIG := @PG_CONFIG@
+PGXS := @PGXS@
 include $(PGXS)
 PERL=@PERL@

diff --git a/loader/Makefile.in b/loader/Makefile.in
index 6954a6cd4a4047cca4f23cc4a672b37e3e37d372..9bf83564a6aca8549a123de838a70a9817bebe47 100644 (file)
--- a/loader/Makefile.in
+++ b/loader/Makefile.in
@@ -15,7 +15,7 @@
 # the DESTDIR variable so we can get the correct install paths.
 # Hence we include the PGXS Makefile here, but ensure that we override the
 # 'all' and 'install' targets with the ones we really want to use below.
-PG_CONFIG = @PG_CONFIG@
+PG_CONFIG := @PG_CONFIG@
 PGXS := @PGXS@
 include $(PGXS)
 

diff --git a/postgis/Makefile.in b/postgis/Makefile.in
index f32fd9db050171b65135f71af696fc7f631552d9..5d86682ef2174f5b86465584cc3153e3127ef747 100644 (file)
--- a/postgis/Makefile.in
+++ b/postgis/Makefile.in
@@ -158,7 +158,7 @@ EXTRA_CLEAN=$(SQL_OBJS) \
        geobuf.pb-c.h
 
 # PGXS information
-PG_CONFIG = @PG_CONFIG@
+PG_CONFIG := @PG_CONFIG@
 PGXS := @PGXS@
 # NO_TEMP_INSTALL is a workaround for a 9.5dev bug. See:
 # http://www.postgresql.org/message-id/CAB7nPqTsR5o3g-fBi6jbsVdhfPiLFWQ_0cGU5=94Rv_8W3qvFA@mail.gmail.com

diff --git a/raster/rt_pg/Makefile.in b/raster/rt_pg/Makefile.in
index 0d939e4a2549083571cc1942f2c7a722695f0455..91b0ec9a51a45df704ab9449aca9358de52e7c6c 100644 (file)
--- a/raster/rt_pg/Makefile.in
+++ b/raster/rt_pg/Makefile.in
@@ -82,7 +82,7 @@ SHLIB_LINK_F = ../rt_core/librtcore.a $(LIBLWGEOM_LDFLAGS) $(LIBPGCOMMON_LDFLAGS
 EXTRA_CLEAN=$(SQL_OBJS) $(DATA_built) rtpostgis_upgrade.sql.in rtpostgis_upgrade_for_extension.sql.in
 
 # PGXS information
-PG_CONFIG = @PG_CONFIG@
+PG_CONFIG := @PG_CONFIG@
 PGXS := @PGXS@
 # NO_TEMP_INSTALL is a workaround for a 9.5dev bug. See:
 # http://www.postgresql.org/message-id/CAB7nPqTsR5o3g-fBi6jbsVdhfPiLFWQ_0cGU5=94Rv_8W3qvFA@mail.gmail.com

diff --git a/topology/Makefile.in b/topology/Makefile.in
index 62c0259f9bd287516c3b8525700789bfcf8f5faf..48e71ddaf34fac354251a8083397fab39072cbd4 100644 (file)
--- a/topology/Makefile.in
+++ b/topology/Makefile.in
@@ -64,7 +64,7 @@ endif
 EXTRA_CLEAN=$(SQL_OBJS) topology_upgrade.sql.in
 
 # PGXS information
-PG_CONFIG = @PG_CONFIG@
+PG_CONFIG := @PG_CONFIG@
 PGXS := @PGXS@
 # NO_TEMP_INSTALL is a workaround for a 9.5dev bug. See:
 # http://www.postgresql.org/message-id/CAB7nPqTsR5o3g-fBi6jbsVdhfPiLFWQ_0cGU5=94Rv_8W3qvFA@mail.gmail.com

diff --git a/utils/Makefile.in b/utils/Makefile.in
index 4d392289594ea2800b47208bf97b70d83cfea07f..5202b6cfafbbe811d51c3155972ba0d892478920 100644 (file)
--- a/utils/Makefile.in
+++ b/utils/Makefile.in
@@ -21,7 +21,7 @@ MODULEDIR=contrib/$(MODULE_doc)
 DATA_built=postgis_restore.pl
 
 # PGXS information
-PG_CONFIG = @PG_CONFIG@
+PG_CONFIG := @PG_CONFIG@
 PGXS := @PGXS@
 include $(PGXS)