[postgis-tickets] r16855 - Fix configure switch --with-library-minor-version in topology

Raul raul at rmr.ninja
Mon Oct 1 04:40:46 PDT 2018


Author: algunenano
Date: 2018-10-01 04:40:46 -0700 (Mon, 01 Oct 2018)
New Revision: 16855

Modified:
   trunk/topology/Makefile.in
Log:
Fix configure switch --with-library-minor-version in topology

References #3807
Closes https://github.com/postgis/postgis/pull/312


Modified: trunk/topology/Makefile.in
===================================================================
--- trunk/topology/Makefile.in	2018-10-01 06:46:33 UTC (rev 16854)
+++ trunk/topology/Makefile.in	2018-10-01 11:40:46 UTC (rev 16855)
@@ -20,11 +20,11 @@
 
 MODULE_big=postgis_topology- at POSTGIS_MAJOR_VERSION@
 MODULEDIR=contrib/postgis- at POSTGIS_MAJOR_VERSION@. at POSTGIS_MINOR_VERSION@
-MODULEPATH    = $$libdir/rtpostgis- at POSTGIS_MAJOR_VERSION@
+MODULEPATH=$$libdir/postgis_topology- at POSTGIS_MAJOR_VERSION@
 
 ifeq (@LIBINCLUDEMINORVERSION@,yes)
 MODULEPATH=$$libdir/postgis_topology- at POSTGIS_MAJOR_VERSION@. at POSTGIS_MINOR_VERSION@
-MODULE_big=postgis_topology-- at POSTGIS_MAJOR_VERSION@. at POSTGIS_MINOR_VERSION@
+MODULE_big=postgis_topology- at POSTGIS_MAJOR_VERSION@. at POSTGIS_MINOR_VERSION@
 endif
 
 # Files to be copied to the contrib/ directory
@@ -95,7 +95,7 @@
 # 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/postgis_topology- at POSTGIS_MAJOR_VERSION@. at POSTGIS_MINOR_VERSION@'g" > $@
+	$(PERL) -lpe "s'MODULE_PATHNAME'\$(MODULEPATH)'g" > $@
 
 #Generate upgrade script by stripping things that can't be reinstalled
 #e.g. don't bother with tables, types, triggers, and domains



More information about the postgis-tickets mailing list