Remove more duplicated PERL assignments

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

diff --git a/extensions/address_standardizer/Makefile.in b/extensions/address_standardizer/Makefile.in
index 898abb3aca139719c6d8b00fa8146381a1765c0f..90fa5f2c313474a0e9fa1cad7ce6dce8dc26244f 100644 (file)
--- 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 aaaad5a7fa110351805e9d6dec5b5c9ae10eeedf..5a2f7993b8e8569a271cd02bf391f0602bccd015 100644 (file)
--- 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 c572b309ff5662970856a340a5ec11ba51fc0358..2d215b89004494b7fc9dbafab479e9310321547a 100644 (file)
--- 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 4d375196c1535c664acc7a5485dc8bb02a42f932..7938e67262a7ad38b7a41155e7200b3040219b55 100644 (file)
--- 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 6b8161f9a3f7bfa3c3fe9cb4252714212f542063..532e3965d565187683391b01c119bd1eb86cd796 100644 (file)
--- 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) | \