From a8ba4a755d70bffae8379699129900cb25e79dbf Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ra=C3=BAl=20Mar=C3=ADn=20Rodr=C3=ADguez?= Date: Mon, 1 Oct 2018 11:40:46 +0000 Subject: [PATCH] Fix configure switch --with-library-minor-version in topology References #3807 Closes https://github.com/postgis/postgis/pull/312 git-svn-id: http://svn.osgeo.org/postgis/trunk@16855 b70326c6-7e19-0410-871a-916f4a2858ee --- topology/Makefile.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/topology/Makefile.in b/topology/Makefile.in index 445f2bea2..62c0259f9 100644 --- a/topology/Makefile.in +++ b/topology/Makefile.in @@ -20,11 +20,11 @@ POSTGIS_PGSQL_VERSION=@POSTGIS_PGSQL_VERSION@ MODULE_big=postgis_topology-@POSTGIS_MAJOR_VERSION@ MODULEDIR=contrib/postgis-@POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@ -MODULEPATH = $$libdir/rtpostgis-@POSTGIS_MAJOR_VERSION@ +MODULEPATH=$$libdir/postgis_topology-@POSTGIS_MAJOR_VERSION@ ifeq (@LIBINCLUDEMINORVERSION@,yes) MODULEPATH=$$libdir/postgis_topology-@POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@ -MODULE_big=postgis_topology--@POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@ +MODULE_big=postgis_topology-@POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@ endif # Files to be copied to the contrib/ directory @@ -95,7 +95,7 @@ endif # 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-@POSTGIS_MAJOR_VERSION@.@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 -- 2.40.0