[postgis-tickets] r16908 - Use portable code to write extension-protection line

Sandro Santilli strk at kbt.io
Mon Oct 15 04:31:58 PDT 2018


Author: strk
Date: 2018-10-15 04:31:58 -0700 (Mon, 15 Oct 2018)
New Revision: 16908

Modified:
   branches/2.2/NEWS
   branches/2.2/extensions/postgis/Makefile.in
   branches/2.2/extensions/postgis_sfcgal/Makefile.in
Log:
Use portable code to write extension-protection line

Closes #4203 in 2.2 branch

Modified: branches/2.2/NEWS
===================================================================
--- branches/2.2/NEWS	2018-10-15 11:31:38 UTC (rev 16907)
+++ branches/2.2/NEWS	2018-10-15 11:31:58 UTC (rev 16908)
@@ -7,6 +7,7 @@
    - #4189, Fix undefined behaviour in SADFWrite (Raúl Marín)
    - #4191, Fix undefined behaviour in ptarray_clone_deep (Raúl Marín)
    - #4020, Fix leftovers in topology upgrade from 2.1 (Sandro Santilli)
+   - #4203, Fix build with GNU Make 4.1 (Sandro Santilli)
 
 PostGIS 2.2.7
 2018/04/06

Modified: branches/2.2/extensions/postgis/Makefile.in
===================================================================
--- branches/2.2/extensions/postgis/Makefile.in	2018-10-15 11:31:38 UTC (rev 16907)
+++ branches/2.2/extensions/postgis/Makefile.in	2018-10-15 11:31:58 UTC (rev 16908)
@@ -38,7 +38,7 @@
 
 sql/$(EXTENSION).sql: sql_bits/postgis.sql sql_bits/postgis_comments.sql sql_bits/rtpostgis.sql sql_bits/spatial_ref_sys_config_dump.sql sql_bits/raster_comments.sql sql_bits/spatial_ref_sys.sql
 	mkdir -p sql
-	echo '\echo Use "CREATE EXTENSION $(EXTENSION)" to load this file. \quit' > $@
+	printf '\\echo Use "CREATE EXTENSION $(EXTENSION)" to load this file. \\quit\n' > $@
 	cat $^ >> $@
 
 sql/$(EXTENSION)--$(EXTVERSION).sql: sql/$(EXTENSION).sql

Modified: branches/2.2/extensions/postgis_sfcgal/Makefile.in
===================================================================
--- branches/2.2/extensions/postgis_sfcgal/Makefile.in	2018-10-15 11:31:38 UTC (rev 16907)
+++ branches/2.2/extensions/postgis_sfcgal/Makefile.in	2018-10-15 11:31:58 UTC (rev 16908)
@@ -70,7 +70,7 @@
 
 sql_bits/sfcgal_upgrade_minor.sql: ../postgis_extension_helper.sql sql_bits/sfcgal_upgrade.sql ../../doc/sfcgal_comments.sql ../postgis_extension_helper_uninstall.sql
 	mkdir -p sql_bits
-	echo '\echo Use "CREATE EXTENSION $(EXTENSION)" to load this file. \quit' > $@
+	printf '\\echo Use "CREATE EXTENSION $(EXTENSION)" to load this file. \\quit\n' > $@
 	cat $^ >> $@
 
 sql_minor_upgrade: sql_bits/sfcgal_upgrade_minor.sql



More information about the postgis-tickets mailing list