[postgis-tickets] r14545 - move perl define below PGXS include to prevent PGXS from overwriting it.

Regina Obe lr at pcorp.us
Mon Jan 4 09:09:47 PST 2016


Author: robe
Date: 2016-01-04 09:09:47 -0800 (Mon, 04 Jan 2016)
New Revision: 14545

Modified:
   branches/2.2/extensions/postgis/Makefile.in
   branches/2.2/extensions/postgis_topology/Makefile.in
Log:
move perl define below PGXS include to prevent PGXS from overwriting it.
Hope this fixes Alpine Linux 3.2 install issue
closes #3390 for PostGIS 2.2

Modified: branches/2.2/extensions/postgis/Makefile.in
===================================================================
--- branches/2.2/extensions/postgis/Makefile.in	2016-01-04 16:26:22 UTC (rev 14544)
+++ branches/2.2/extensions/postgis/Makefile.in	2016-01-04 17:09:47 UTC (rev 14545)
@@ -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) | \
@@ -122,3 +121,4 @@
 
 PGXS := $(shell $(PG_CONFIG) --pgxs)
 include $(PGXS)
+PERL=@PERL@

Modified: branches/2.2/extensions/postgis_topology/Makefile.in
===================================================================
--- branches/2.2/extensions/postgis_topology/Makefile.in	2016-01-04 16:26:22 UTC (rev 14544)
+++ branches/2.2/extensions/postgis_topology/Makefile.in	2016-01-04 17:09:47 UTC (rev 14545)
@@ -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) | \
@@ -87,3 +86,4 @@
 
 PGXS := $(shell $(PG_CONFIG) --pgxs)
 include $(PGXS)
+PERL=@PERL@



More information about the postgis-tickets mailing list