Fix build of postgis upgrade when configuring --without-raster

git-svn-id: http://svn.osgeo.org/postgis/trunk@16753 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/configure.ac b/configure.ac
index a5dd951690ddf0498153f5a13c157ea880974117..89112ed1c2de53742e9a9b9acd347d2b6db9b8fe 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1420,7 +1420,10 @@ if test "x$with_raster" != "xno"; then
 
 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
 
 

diff --git a/extensions/postgis/Makefile.in b/extensions/postgis/Makefile.in
index 88f6a6fb9d83c42a4f6b2e5face81888c4d613cc..2015bf11f10e6d3ce60a9b9b0eab4e54e181a4ac 100644 (file)
--- a/extensions/postgis/Makefile.in
+++ b/extensions/postgis/Makefile.in
@@ -78,7 +78,7 @@ $(EXTENSION).control: $(EXTENSION).control.in Makefile
                > $@
 
 $(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

diff --git a/raster/rt_pg/Makefile.in b/raster/rt_pg/Makefile.in
index 846f55bc207122439847ae669c31e30c909a4e4c..4197b8c3318314a22b35e588f0abd467f87e377d 100644 (file)
--- a/raster/rt_pg/Makefile.in
+++ b/raster/rt_pg/Makefile.in
@@ -33,6 +33,9 @@ SQLPP = @SQLPP@
 # 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 \