Commit f37dfa5c authored by Raúl Marín's avatar Raúl Marín

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
parent ae28b2dc
Pipeline #37429028 passed with stage
in 31 minutes and 5 seconds
......@@ -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)
......
......@@ -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@
......@@ -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@
......@@ -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@
......@@ -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@
......@@ -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@
......@@ -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@
......@@ -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)
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment