From: Sandro Santilli Date: Fri, 14 Sep 2018 13:53:24 +0000 (+0000) Subject: Do not include PGXS from extensions Makefiles X-Git-Tag: 3.0.0alpha1~412 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4b5a2536a5d05831bdf25b1675ab1d072bd532db;p=postgis Do not include PGXS from extensions Makefiles it is not needed and messes up our PERL variable git-svn-id: http://svn.osgeo.org/postgis/trunk@16792 b70326c6-7e19-0410-871a-916f4a2858ee --- diff --git a/extensions/address_standardizer/Makefile.in b/extensions/address_standardizer/Makefile.in index 898abb3ac..3553b1423 100644 --- a/extensions/address_standardizer/Makefile.in +++ b/extensions/address_standardizer/Makefile.in @@ -188,7 +188,3 @@ 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 0fdef5244..96c475919 100644 --- a/extensions/postgis/Makefile.in +++ b/extensions/postgis/Makefile.in @@ -131,7 +131,3 @@ 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 ea44006c6..06d3ff5d0 100644 --- a/extensions/postgis_raster/Makefile.in +++ b/extensions/postgis_raster/Makefile.in @@ -106,7 +106,3 @@ 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 4d375196c..abfe5144e 100644 --- a/extensions/postgis_sfcgal/Makefile.in +++ b/extensions/postgis_sfcgal/Makefile.in @@ -107,7 +107,3 @@ 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 88af96def..fca56c9f7 100644 --- a/extensions/postgis_tiger_geocoder/Makefile.in +++ b/extensions/postgis_tiger_geocoder/Makefile.in @@ -248,7 +248,3 @@ 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 6b8161f9a..47699594c 100644 --- a/extensions/postgis_topology/Makefile.in +++ b/extensions/postgis_topology/Makefile.in @@ -94,7 +94,3 @@ include ../upgrade-paths-rules.mk distclean: clean rm Makefile - -PGXS := $(shell $(PG_CONFIG) --pgxs) -include $(PGXS) -PERL=@PERL@