Match version numbers to new naming conventions.

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

diff --git a/java/jdbc/Makefile b/java/jdbc/Makefile
index 5dc8a115f2ab39f6a88d0aa4fdefd8d9845d1259..f8955c27ecad5187ce0b3f55bf8994af06994cfa 100644 (file)
--- a/java/jdbc/Makefile
+++ b/java/jdbc/Makefile
@@ -119,7 +119,7 @@ include ../../Version.config
 # and installdirs targets, not for building itsself.
 -include ../../Makefile.config
 
-VERSION=$(REL_MAJOR_VERSION).$(REL_MINOR_VERSION).$(REL_MICRO_VERSION)
+VERSION=$(POSTGIS_MAJOR_VERSION).$(POSTGIS_MINOR_VERSION).$(POSTGIS_MICRO_VERSION)
 
 # We copy the ../Version.config into the jar to have it read at runtime.
 VERSIONPATH=$(BUILD)/org/postgis

diff --git a/java/jdbc/build.xml b/java/jdbc/build.xml
index 9d6aa8aa8cd98e72f096d532b78e2aa6068f2b76..660c2f5ab017f319114904e5ceb95e58d7f14030 100644 (file)
--- a/java/jdbc/build.xml
+++ b/java/jdbc/build.xml
@@ -42,7 +42,7 @@
 
   <!-- Load in the version information from Version.config -->
   <property file="${versioninfo}"/>
-  <property name="postgis_version" value="${REL_MAJOR_VERSION}.${REL_MINOR_VERSION}.${REL_MICRO_VERSION}"/>
+  <property name="postgis_version" value="${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}"/>
 
   <!-- Build classpath - required to build the PostGIS JDBC driver -->
   <path id="buildclasspath">