[postgis-commits] svn - r2885 - in trunk: . loader lwgeom topology

[postgis-commits at postgis.refractions.net]

Author: mcayland
Date: 2008-07-28 03:03:31 -0700 (Mon, 28 Jul 2008)
New Revision: 2885

Added:
   trunk/topology/Makefile.in
Removed:
   trunk/topology/Makefile
Modified:
   trunk/configure.ac
   trunk/loader/Makefile.pgsql2shp.in
   trunk/loader/Makefile.shp2pgsql.in
   trunk/lwgeom/Makefile.in
Log:
Allow Makefile substitutions for PGCONFIG which are required if pg_config is not located in the path. Note that as part of this fix, we now need to generate topology/Makefile using autoconf. Thanks to Jorgen Austvik for the report and partial patch.

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2008-07-28 09:13:45 UTC (rev 2884)
+++ trunk/configure.ac	2008-07-28 10:03:31 UTC (rev 2885)
@@ -412,5 +412,5 @@
 dnl AC_MSG_RESULT([SHLIB_LINK: $SHLIB_LINK])
 
 dnl Output the relevant files
-AC_OUTPUT([liblwgeom/Makefile lwgeom/Makefile lwgeom/sqldefines.h loader/Makefile.pgsql2shp loader/Makefile.shp2pgsql regress/Makefile doc/Makefile])
+AC_OUTPUT([liblwgeom/Makefile lwgeom/Makefile lwgeom/sqldefines.h loader/Makefile.pgsql2shp loader/Makefile.shp2pgsql topology/Makefile regress/Makefile doc/Makefile])
 

Modified: trunk/loader/Makefile.pgsql2shp.in
===================================================================
--- trunk/loader/Makefile.pgsql2shp.in	2008-07-28 09:13:45 UTC (rev 2884)
+++ trunk/loader/Makefile.pgsql2shp.in	2008-07-28 10:03:31 UTC (rev 2885)
@@ -24,7 +24,7 @@
 
 
 # PGXS information
-PG_CONFIG = pg_config
+PG_CONFIG = @PGCONFIG@ 
 PGXS := $(shell $(PG_CONFIG) --pgxs)
 include $(PGXS)
 

Modified: trunk/loader/Makefile.shp2pgsql.in
===================================================================
--- trunk/loader/Makefile.shp2pgsql.in	2008-07-28 09:13:45 UTC (rev 2884)
+++ trunk/loader/Makefile.shp2pgsql.in	2008-07-28 10:03:31 UTC (rev 2885)
@@ -22,7 +22,7 @@
 PG_LIBS=@ICONV_LDFLAGS@
 
 # PGXS information
-PG_CONFIG = pg_config
+PG_CONFIG = @PGCONFIG@ 
 PGXS := $(shell $(PG_CONFIG) --pgxs)
 include $(PGXS)
 

Modified: trunk/lwgeom/Makefile.in
===================================================================
--- trunk/lwgeom/Makefile.in	2008-07-28 09:13:45 UTC (rev 2884)
+++ trunk/lwgeom/Makefile.in	2008-07-28 10:03:31 UTC (rev 2885)
@@ -60,7 +60,7 @@
 EXTRA_CLEAN=$(SQL_OBJS)
 
 # PGXS information
-PG_CONFIG = pg_config
+PG_CONFIG = @PGCONFIG@ 
 PGXS := $(shell $(PG_CONFIG) --pgxs)
 include $(PGXS)
 

Deleted: trunk/topology/Makefile
===================================================================
--- trunk/topology/Makefile	2008-07-28 09:13:45 UTC (rev 2884)
+++ trunk/topology/Makefile	2008-07-28 10:03:31 UTC (rev 2885)
@@ -1,28 +0,0 @@
-#
-# PostGIS PGXS build system
-#
-
-# Files to be copied to the contrib/ directory
-DATA_built=topology.sql
-
-# SQL objects (files requiring C pre-processing)
-SQL_OBJS=topology.sql.in
-
-# Extra files to remove during 'make clean'
-EXTRA_CLEAN=$(SQL_OBJS)
-
-# PGXS information
-PG_CONFIG = pg_config
-PGXS := $(shell $(PG_CONFIG) --pgxs)
-include $(PGXS)
-
-
-# Unfortunately we have to copy this from the PGXS Makefile as it only gets picked up
-# if MODULE_big is defined
-%.sql: %.sql.in
-	sed 's,MODULE_PATHNAME,$$libdir/$*,g' $< >$@
-
-# Generate any .sql.in files from .sql.in.c files by running them through the C pre-processor 
-$(SQL_OBJS): %.in: %.in.c
-	$(CPP) -traditional-cpp $< | grep -v '^#' > $@
-

Added: trunk/topology/Makefile.in
===================================================================
--- trunk/topology/Makefile.in	2008-07-28 09:13:45 UTC (rev 2884)
+++ trunk/topology/Makefile.in	2008-07-28 10:03:31 UTC (rev 2885)
@@ -0,0 +1,28 @@
+#
+# PostGIS PGXS build system
+#
+
+# Files to be copied to the contrib/ directory
+DATA_built=topology.sql
+
+# SQL objects (files requiring C pre-processing)
+SQL_OBJS=topology.sql.in
+
+# Extra files to remove during 'make clean'
+EXTRA_CLEAN=$(SQL_OBJS)
+
+# PGXS information
+PG_CONFIG = @PGCONFIG@ 
+PGXS := $(shell $(PG_CONFIG) --pgxs)
+include $(PGXS)
+
+
+# Unfortunately we have to copy this from the PGXS Makefile as it only gets picked up
+# if MODULE_big is defined
+%.sql: %.sql.in
+	sed 's,MODULE_PATHNAME,$$libdir/$*,g' $< >$@
+
+# Generate any .sql.in files from .sql.in.c files by running them through the C pre-processor 
+$(SQL_OBJS): %.in: %.in.c
+	$(CPP) -traditional-cpp $< | grep -v '^#' > $@
+