[postgis-tickets] r16753 - Fix build of postgis upgrade when configuring --without-raster

[Sandro Santilli]

Author: strk
Date: 2018-09-11 02:20:32 -0700 (Tue, 11 Sep 2018)
New Revision: 16753

Modified:
   trunk/configure.ac
   trunk/extensions/postgis/Makefile.in
   trunk/raster/rt_pg/Makefile.in
Log:
Fix build of postgis upgrade when configuring --without-raster

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2018-09-11 09:20:25 UTC (rev 16752)
+++ trunk/configure.ac	2018-09-11 09:20:32 UTC (rev 16753)
@@ -1420,7 +1420,10 @@
 
 else
 	AC_MSG_RESULT([RASTER: Raster support disabled])
-	RT_MAKEFILE_LIST="raster/Makefile"
+
+	dnl We still generate raster/rt_pg makefile to
+	dnl use for upgrading from pre-split-raster versions
+	RT_MAKEFILE_LIST="raster/Makefile raster/rt_pg/Makefile"
 fi
 
 

Modified: trunk/extensions/postgis/Makefile.in
===================================================================
--- trunk/extensions/postgis/Makefile.in	2018-09-11 09:20:25 UTC (rev 16752)
+++ trunk/extensions/postgis/Makefile.in	2018-09-11 09:20:32 UTC (rev 16753)
@@ -78,7 +78,7 @@
 		> $@
 
 $(RASTER_DROP_SCRIPTS):
-	$(MAKE) -C ../../raster
+	$(MAKE) -C ../../raster/rt_pg sql_objs
 
 sql/raster_unpackage.sql: Makefile
 sql/raster_unpackage.sql: ../../utils/create_extension_unpackage.pl

Modified: trunk/raster/rt_pg/Makefile.in
===================================================================
--- trunk/raster/rt_pg/Makefile.in	2018-09-11 09:20:25 UTC (rev 16752)
+++ trunk/raster/rt_pg/Makefile.in	2018-09-11 09:20:32 UTC (rev 16753)
@@ -33,6 +33,9 @@
 # SQL objects (files requiring pre-processing)
 SQL_OBJS=rtpostgis.sql rtpostgis_drop.sql rtpostgis_upgrade_cleanup.sql rtpostgis_legacy.sql
 
+# Utility rule for use from outside
+sql_objs: $(DATA_built)
+
 # Objects to build using PGXS
 OBJS = \
 	rtpostgis.o \