[postgis-tickets] r17044 - Uniformize how PGXS is used

Raul raul at rmr.ninja
Wed Nov 21 08:21:53 PST 2018 

Author: algunenano
Date: 2018-11-21 08:21:52 -0800 (Wed, 21 Nov 2018)
New Revision: 17044

Modified:
   trunk/doc/Makefile.comments.in
   trunk/extensions/address_standardizer/Makefile.in
   trunk/extensions/postgis/Makefile.in
   trunk/extensions/postgis_raster/Makefile.in
   trunk/extensions/postgis_sfcgal/Makefile.in
   trunk/extensions/postgis_tiger_geocoder/Makefile.in
   trunk/extensions/postgis_topology/Makefile.in
   trunk/loader/Makefile.in
   trunk/postgis/Makefile.in
   trunk/raster/rt_pg/Makefile.in
   trunk/topology/Makefile.in
   trunk/utils/Makefile.in
Log:
Uniformize how PGXS is used

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


Modified: trunk/doc/Makefile.comments.in
===================================================================
--- trunk/doc/Makefile.comments.in	2018-11-21 14:14:01 UTC (rev 17043)
+++ trunk/doc/Makefile.comments.in	2018-11-21 16:21:52 UTC (rev 17044)
@@ -20,7 +20,7 @@
 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)
 

Modified: trunk/extensions/address_standardizer/Makefile.in
===================================================================
--- trunk/extensions/address_standardizer/Makefile.in	2018-11-21 14:14:01 UTC (rev 17043)
+++ trunk/extensions/address_standardizer/Makefile.in	2018-11-21 16:21:52 UTC (rev 17044)
@@ -56,11 +56,7 @@
 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
 sql/%.sql: %.sql.in
@@ -184,6 +180,7 @@
 distclean: clean
 	rm Makefile
 
+PG_CONFIG := @PG_CONFIG@
 PGXS := @PGXS@
 include $(PGXS)
 PERL = @PERL@

Modified: trunk/extensions/postgis/Makefile.in
===================================================================
--- trunk/extensions/postgis/Makefile.in	2018-11-21 14:14:01 UTC (rev 17043)
+++ trunk/extensions/postgis/Makefile.in	2018-11-21 16:21:52 UTC (rev 17044)
@@ -59,8 +59,6 @@
 	../../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 @@
 distclean: clean
 	rm -f Makefile
 
-PGXS := $(shell $(PG_CONFIG) --pgxs)
+PG_CONFIG := @PG_CONFIG@
+PGXS := @PGXS@
 include $(PGXS)
 PERL = @PERL@

Modified: trunk/extensions/postgis_raster/Makefile.in
===================================================================
--- trunk/extensions/postgis_raster/Makefile.in	2018-11-21 14:14:01 UTC (rev 17043)
+++ trunk/extensions/postgis_raster/Makefile.in	2018-11-21 16:21:52 UTC (rev 17044)
@@ -51,8 +51,6 @@
 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 @@
 distclean: clean
 	rm -f Makefile
 
-PGXS := $(shell $(PG_CONFIG) --pgxs)
+PG_CONFIG := @PG_CONFIG@
+PGXS := @PGXS@
 include $(PGXS)
 PERL = @PERL@

Modified: trunk/extensions/postgis_sfcgal/Makefile.in
===================================================================
--- trunk/extensions/postgis_sfcgal/Makefile.in	2018-11-21 14:14:01 UTC (rev 17043)
+++ trunk/extensions/postgis_sfcgal/Makefile.in	2018-11-21 16:21:52 UTC (rev 17044)
@@ -39,8 +39,6 @@
 	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 @@
 distclean: clean
 	rm Makefile
 
-PGXS := $(shell $(PG_CONFIG) --pgxs)
+PG_CONFIG := @PG_CONFIG@
+PGXS := @PGXS@
 include $(PGXS)
 PERL = @PERL@

Modified: trunk/extensions/postgis_tiger_geocoder/Makefile.in
===================================================================
--- trunk/extensions/postgis_tiger_geocoder/Makefile.in	2018-11-21 14:14:01 UTC (rev 17043)
+++ trunk/extensions/postgis_tiger_geocoder/Makefile.in	2018-11-21 16:21:52 UTC (rev 17044)
@@ -31,8 +31,6 @@
 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 @@
 distclean: clean
 	rm Makefile
 
-PGXS := $(shell $(PG_CONFIG) --pgxs)
+PG_CONFIG := @PG_CONFIG@
+PGXS := @PGXS@
 include $(PGXS)
 PERL=@PERL@

Modified: trunk/extensions/postgis_topology/Makefile.in
===================================================================
--- trunk/extensions/postgis_topology/Makefile.in	2018-11-21 14:14:01 UTC (rev 17043)
+++ trunk/extensions/postgis_topology/Makefile.in	2018-11-21 16:21:52 UTC (rev 17044)
@@ -40,8 +40,6 @@
 	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 @@
 distclean: clean
 	rm Makefile
 
-PGXS := $(shell $(PG_CONFIG) --pgxs)
+PG_CONFIG := @PG_CONFIG@
+PGXS := @PGXS@
 include $(PGXS)
 PERL=@PERL@

Modified: trunk/loader/Makefile.in
===================================================================
--- trunk/loader/Makefile.in	2018-11-21 14:14:01 UTC (rev 17043)
+++ trunk/loader/Makefile.in	2018-11-21 16:21:52 UTC (rev 17044)
@@ -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)
 

Modified: trunk/postgis/Makefile.in
===================================================================
--- trunk/postgis/Makefile.in	2018-11-21 14:14:01 UTC (rev 17043)
+++ trunk/postgis/Makefile.in	2018-11-21 16:21:52 UTC (rev 17044)
@@ -158,7 +158,7 @@
 	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

Modified: trunk/raster/rt_pg/Makefile.in
===================================================================
--- trunk/raster/rt_pg/Makefile.in	2018-11-21 14:14:01 UTC (rev 17043)
+++ trunk/raster/rt_pg/Makefile.in	2018-11-21 16:21:52 UTC (rev 17044)
@@ -82,7 +82,7 @@
 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

Modified: trunk/topology/Makefile.in
===================================================================
--- trunk/topology/Makefile.in	2018-11-21 14:14:01 UTC (rev 17043)
+++ trunk/topology/Makefile.in	2018-11-21 16:21:52 UTC (rev 17044)
@@ -64,7 +64,7 @@
 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

Modified: trunk/utils/Makefile.in
===================================================================
--- trunk/utils/Makefile.in	2018-11-21 14:14:01 UTC (rev 17043)
+++ trunk/utils/Makefile.in	2018-11-21 16:21:52 UTC (rev 17044)
@@ -21,7 +21,7 @@
 DATA_built=postgis_restore.pl
 
 # PGXS information
-PG_CONFIG = @PG_CONFIG@
+PG_CONFIG := @PG_CONFIG@
 PGXS := @PGXS@
 include $(PGXS)

More information about the postgis-tickets mailing list