[postgis-tickets] r16795 - Remove more duplicated PERL assignments
Sandro Santilli
strk at kbt.io
Fri Sep 14 07:32:40 PDT 2018
Author: strk
Date: 2018-09-14 07:32:40 -0700 (Fri, 14 Sep 2018)
New Revision: 16795
Modified:
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_topology/Makefile.in
Log:
Remove more duplicated PERL assignments
Modified: trunk/extensions/address_standardizer/Makefile.in
===================================================================
--- trunk/extensions/address_standardizer/Makefile.in 2018-09-14 13:57:00 UTC (rev 16794)
+++ trunk/extensions/address_standardizer/Makefile.in 2018-09-14 14:32:40 UTC (rev 16795)
@@ -29,7 +29,6 @@
# SQL preprocessor
SQLPP = @SQLPP@
GREP=@GREP@
-PERL=@PERL@
EXTVERSION = @POSTGIS_LIB_VERSION@
MINORVERSION = @POSTGIS_MAJOR_VERSION at .@POSTGIS_MINOR_VERSION@
MODULE_big = address_standardizer
@@ -62,10 +61,6 @@
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
Modified: trunk/extensions/postgis/Makefile.in
===================================================================
--- trunk/extensions/postgis/Makefile.in 2018-09-14 13:57:00 UTC (rev 16794)
+++ trunk/extensions/postgis/Makefile.in 2018-09-14 14:32:40 UTC (rev 16795)
@@ -55,7 +55,6 @@
../../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)
Modified: trunk/extensions/postgis_raster/Makefile.in
===================================================================
--- trunk/extensions/postgis_raster/Makefile.in 2018-09-14 13:57:00 UTC (rev 16794)
+++ trunk/extensions/postgis_raster/Makefile.in 2018-09-14 14:32:40 UTC (rev 16795)
@@ -47,7 +47,6 @@
EXTENSION_UNPACKAGED_UPGRADE_SCRIPTS = \
sql/rtpostgis.sql
-#DOCS = $(wildcard ../../doc/html/*.html)
PG_CONFIG = @PG_CONFIG@
SQL_BITS = $(wildcard sql/*.sql)
Modified: trunk/extensions/postgis_sfcgal/Makefile.in
===================================================================
--- trunk/extensions/postgis_sfcgal/Makefile.in 2018-09-14 13:57:00 UTC (rev 16794)
+++ trunk/extensions/postgis_sfcgal/Makefile.in 2018-09-14 14:32:40 UTC (rev 16795)
@@ -4,7 +4,6 @@
EXTVERSION = @POSTGIS_LIB_VERSION@
MINORVERSION = @POSTGIS_MAJOR_VERSION at .@POSTGIS_MINOR_VERSION@
GREP = @GREP@
-PERL = @PERL@
MICRO_NUMBER = $(shell echo $(EXTVERSION) | \
$(PERL) -pe 's/\d.\d.(\d+)[a-zA-Z]*\d*/$1/'
Modified: trunk/extensions/postgis_topology/Makefile.in
===================================================================
--- trunk/extensions/postgis_topology/Makefile.in 2018-09-14 13:57:00 UTC (rev 16794)
+++ trunk/extensions/postgis_topology/Makefile.in 2018-09-14 14:32:40 UTC (rev 16795)
@@ -4,7 +4,6 @@
EXTVERSION = @POSTGIS_LIB_VERSION@
MINORVERSION = @POSTGIS_MAJOR_VERSION at .@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) | \
More information about the postgis-tickets
mailing list