From 887d7d8e5ee5220c3730305ade835bfc005ab6c0 Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Fri, 14 Sep 2018 14:32:40 +0000 Subject: [PATCH] Remove more duplicated PERL assignments git-svn-id: http://svn.osgeo.org/postgis/trunk@16795 b70326c6-7e19-0410-871a-916f4a2858ee --- extensions/address_standardizer/Makefile.in | 5 ----- extensions/postgis/Makefile.in | 1 - extensions/postgis_raster/Makefile.in | 1 - extensions/postgis_sfcgal/Makefile.in | 1 - extensions/postgis_topology/Makefile.in | 1 - 5 files changed, 9 deletions(-) diff --git a/extensions/address_standardizer/Makefile.in b/extensions/address_standardizer/Makefile.in index 898abb3ac..90fa5f2c3 100644 --- a/extensions/address_standardizer/Makefile.in +++ b/extensions/address_standardizer/Makefile.in @@ -29,7 +29,6 @@ POSTGIS_PGSQL_VERSION=@POSTGIS_PGSQL_VERSION@ # SQL preprocessor SQLPP = @SQLPP@ GREP=@GREP@ -PERL=@PERL@ EXTVERSION = @POSTGIS_LIB_VERSION@ MINORVERSION = @POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@ MODULE_big = address_standardizer @@ -62,10 +61,6 @@ PG_CONFIG = @PG_CONFIG@ PGVER := $(shell $(PG_CONFIG) --version) - -# Set PERL _after_ the include of PGXS -PERL=@PERL@ - # Borrow the $libdir substitution from PGXS but customise by running the preprocessor # and adding the version number sql/%.sql: %.sql.in diff --git a/extensions/postgis/Makefile.in b/extensions/postgis/Makefile.in index aaaad5a7f..5a2f7993b 100644 --- a/extensions/postgis/Makefile.in +++ b/extensions/postgis/Makefile.in @@ -55,7 +55,6 @@ RASTER_DROP_SCRIPTS = \ ../../raster/rt_pg/rtpostgis_drop.sql \ ../../raster/rt_pg/uninstall_rtpostgis.sql -#DOCS = $(wildcard ../../doc/html/*.html) PG_CONFIG = @PG_CONFIG@ SQL_BITS = $(wildcard sql/*.sql) diff --git a/extensions/postgis_raster/Makefile.in b/extensions/postgis_raster/Makefile.in index c572b309f..2d215b890 100644 --- a/extensions/postgis_raster/Makefile.in +++ b/extensions/postgis_raster/Makefile.in @@ -47,7 +47,6 @@ EXTENSION_UPGRADE_SCRIPTS = \ EXTENSION_UNPACKAGED_UPGRADE_SCRIPTS = \ sql/rtpostgis.sql -#DOCS = $(wildcard ../../doc/html/*.html) PG_CONFIG = @PG_CONFIG@ SQL_BITS = $(wildcard sql/*.sql) diff --git a/extensions/postgis_sfcgal/Makefile.in b/extensions/postgis_sfcgal/Makefile.in index 4d375196c..7938e6726 100644 --- a/extensions/postgis_sfcgal/Makefile.in +++ b/extensions/postgis_sfcgal/Makefile.in @@ -4,7 +4,6 @@ EXTENSION = postgis_sfcgal EXTVERSION = @POSTGIS_LIB_VERSION@ MINORVERSION = @POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@ GREP = @GREP@ -PERL = @PERL@ MICRO_NUMBER = $(shell echo $(EXTVERSION) | \ $(PERL) -pe 's/\d.\d.(\d+)[a-zA-Z]*\d*/$1/' diff --git a/extensions/postgis_topology/Makefile.in b/extensions/postgis_topology/Makefile.in index 6b8161f9a..532e3965d 100644 --- a/extensions/postgis_topology/Makefile.in +++ b/extensions/postgis_topology/Makefile.in @@ -4,7 +4,6 @@ EXTENSION = postgis_topology EXTVERSION = @POSTGIS_LIB_VERSION@ MINORVERSION = @POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@ GREP = @GREP@ -PERL = @PERL@ MICRO_NUMBER = $(shell echo $(EXTVERSION) | sed "s/[0-9]\.[0-9]\.\([0-9]*\)[a-zA-Z]*[0-9]*/\1/") PREREL_NUMBER = $(shell echo $(EXTVERSION) | \ -- 2.40.0