Review comments above Makefile rule to generate .sql from .sql.in

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

diff --git a/postgis/Makefile.in b/postgis/Makefile.in
index 8efabc1cb27ec1f6abedca288cd89a25d26f7086..b85f92b4065b6efe7adebce18036b39101dcb6d3 100644 (file)
--- a/postgis/Makefile.in
+++ b/postgis/Makefile.in
@@ -131,7 +131,8 @@ $(PG_OBJS): ../liblwgeom/.libs/liblwgeom.a ../libpgcommon/libpgcommon.a ../postg
 ../libpgcommon/libpgcommon.a:
        make -C ../libpgcommon libpgcommon.a
 
-# Borrow the $libdir substitution from PGXS but customise by adding the version number
+# Borrow the $libdir substitution from PGXS but customise by running the preprocessor
+# and adding the version number
 %.sql: %.sql.in
        $(SQLPP) -I../libpgcommon $< | grep -v '^#' | \
        $(PERL) -lpe "s'MODULE_PATHNAME'\$$libdir/postgis-@POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@'g" > $@

diff --git a/raster/rt_pg/Makefile.in b/raster/rt_pg/Makefile.in
index b9e3086722fb125f8b30c1e2b484759c50bd830b..d82883fc197e3bdcbbee40f2ab8c3601018f3b59 100644 (file)
--- a/raster/rt_pg/Makefile.in
+++ b/raster/rt_pg/Makefile.in
@@ -82,7 +82,8 @@ ifeq ($(REGRESS),1)
         datamoduledir=contrib/postgis
 endif
 
-# Borrow the $libdir substitution from PGXS but customise by adding the version number
+# Borrow the $libdir substitution from PGXS but customise by running the preprocessor
+# and adding the version number
 %.sql: %.sql.in
        $(SQLPP) -I../../postgis/ -I../../ $< | grep -v '^#' | \
        $(PERL) -lpe "s'MODULE_PATHNAME'\$$libdir/rtpostgis-@POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@'g" > $@

diff --git a/topology/Makefile.in b/topology/Makefile.in
index 8eaab94148eb21c95746f4f10bf8ad245a1a6bfe..6216ab7018ce4830f6835bf65c4c42d1898da4c1 100644 (file)
--- a/topology/Makefile.in
+++ b/topology/Makefile.in
@@ -73,16 +73,10 @@ endif
 
 
 
-# Unfortunately we have to copy this from the PGXS Makefile as it only gets picked up
-# if MODULE_big is defined
+# Generate any .sql file from .sql.in.c files by running them through the SQL pre-processor 
 %.sql: %.sql.in
-       $(SQLPP) $< | grep -v '^#' | \
-       $(PERL) -lpe "s'MODULE_PATHNAME'\$$libdir/$*'g" > $@
+       $(SQLPP) $< | grep -v '^#' > $@
 
-# Generate any .sql.in files from .sql.in.c files by running them through the SQL pre-processor 
-#%.in: %.in.c
-#      $(SQLPP) $< | grep -v '^#' > $@
-       
 #Generate upgrade script by stripping things that can't be reinstalled
 #e.g. don't bother with tables, types, triggers, and domains
 topology_upgrade.sql:  topology.sql