From c77f57da4b32fd6861aeee9655d1339ba9e26af0 Mon Sep 17 00:00:00 2001 From: Bborie Park Date: Mon, 2 Jan 2012 06:59:04 +0000 Subject: [PATCH] Renamed legacy.sql.in.c to rtpostgis_legacy.sql.in.c to not conflict with postgis' legacy.sql. Associated ticket is #1422. git-svn-id: http://svn.osgeo.org/postgis/trunk@8647 b70326c6-7e19-0410-871a-916f4a2858ee --- raster/rt_pg/.svnignore | 4 ++-- raster/rt_pg/Makefile.in | 4 ++-- raster/rt_pg/{legacy.sql.in.c => rtpostgis_legacy.sql.in.c} | 0 3 files changed, 4 insertions(+), 4 deletions(-) rename raster/rt_pg/{legacy.sql.in.c => rtpostgis_legacy.sql.in.c} (100%) diff --git a/raster/rt_pg/.svnignore b/raster/rt_pg/.svnignore index f565428a9..2d7bbf76e 100644 --- a/raster/rt_pg/.svnignore +++ b/raster/rt_pg/.svnignore @@ -8,5 +8,5 @@ rtpostgis_upgrade_20_minor.sql rtpostgis_upgrade_cleanup.sql rtpostgis_upgrade_cleanup.sql.in uninstall_rtpostgis.sql -legacy.sql -legacy.sql.in +rtpostgis_legacy.sql +rtpostgis_legacy.sql.in diff --git a/raster/rt_pg/Makefile.in b/raster/rt_pg/Makefile.in index 9fb58cc37..254543370 100644 --- a/raster/rt_pg/Makefile.in +++ b/raster/rt_pg/Makefile.in @@ -14,11 +14,11 @@ MODULE_big=rtpostgis-@POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@ MODULEDIR=contrib/postgis-@POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@ # Files to be copied to the contrib/ directory -DATA_built=rtpostgis.sql rtpostgis_drop.sql rtpostgis_upgrade_20_minor.sql rtpostgis_upgrade_cleanup.sql uninstall_rtpostgis.sql legacy.sql +DATA_built=rtpostgis.sql rtpostgis_drop.sql rtpostgis_upgrade_20_minor.sql rtpostgis_upgrade_cleanup.sql uninstall_rtpostgis.sql rtpostgis_legacy.sql DATA= # SQL objects (files requiring C pre-processing) -SQL_OBJS=rtpostgis.sql.in rtpostgis_drop.sql.in rtpostgis_upgrade_cleanup.sql.in legacy.sql.in +SQL_OBJS=rtpostgis.sql.in rtpostgis_drop.sql.in rtpostgis_upgrade_cleanup.sql.in rtpostgis_legacy.sql.in # Objects to build using PGXS OBJS=rt_pg.o diff --git a/raster/rt_pg/legacy.sql.in.c b/raster/rt_pg/rtpostgis_legacy.sql.in.c similarity index 100% rename from raster/rt_pg/legacy.sql.in.c rename to raster/rt_pg/rtpostgis_legacy.sql.in.c