From: Sandro Santilli Date: Fri, 14 Sep 2018 13:57:00 +0000 (+0000) Subject: Do not define PERL twice in the same Makefile X-Git-Tag: 3.0.0alpha1~410 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3005e3c50c7e9499693aec8509ea0a204fb12d2e;p=postgis Do not define PERL twice in the same Makefile git-svn-id: http://svn.osgeo.org/postgis/trunk@16794 b70326c6-7e19-0410-871a-916f4a2858ee --- diff --git a/extensions/postgis/Makefile.in b/extensions/postgis/Makefile.in index 0fdef5244..aaaad5a7f 100644 --- a/extensions/postgis/Makefile.in +++ b/extensions/postgis/Makefile.in @@ -5,7 +5,6 @@ EXTVERSION = @POSTGIS_LIB_VERSION@ MINORVERSION = @POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@ MODULEPATH = $$libdir/$(EXTENSION)-$(MINORVERSION) GREP = @GREP@ -PERL = @PERL@ MICRO_NUMBER = $(shell echo $(EXTVERSION) | \ $(PERL) -pe 's/\d.\d.(\d+)[a-zA-Z]*\d*/$1/' @@ -81,7 +80,7 @@ $(RASTER_DROP_SCRIPTS): $(MAKE) -C ../../raster/rt_pg sql_objs sql/raster_unpackage.sql: Makefile -sql/raster_unpackage.sql: $(PERL) ../../utils/create_extension_unpackage.pl +sql/raster_unpackage.sql: ../../utils/create_extension_unpackage.pl sql/raster_unpackage.sql: unpackage_raster_if_needed.sql sql/raster_unpackage.sql: $(RASTER_DROP_SCRIPTS) | sql diff --git a/extensions/postgis_raster/Makefile.in b/extensions/postgis_raster/Makefile.in index ea44006c6..c572b309f 100644 --- a/extensions/postgis_raster/Makefile.in +++ b/extensions/postgis_raster/Makefile.in @@ -5,7 +5,6 @@ EXTVERSION = @POSTGIS_LIB_VERSION@ MINORVERSION = @POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@ MODULEPATH = $$libdir/$(EXTENSION)-$(MINORVERSION) GREP = @GREP@ -PERL = @PERL@ MICRO_NUMBER = $(shell echo $(EXTVERSION) | \ $(PERL) -pe 's/\d.\d.(\d+)[a-zA-Z]*\d*/$1/'