Finished build.xml and updated Driver.java.in and buildDriver to match how Makefile and ANT operate.

1 files changed, 4 insertions, 4 deletions

diff --git a/src/interfaces/jdbc/org/postgresql/Driver.java.in b/src/interfaces/jdbc/org/postgresql/Driver.java.in
index 40e2a94956..552d188109 100644
--- a/src/interfaces/jdbc/org/postgresql/Driver.java.in
+++ b/src/interfaces/jdbc/org/postgresql/Driver.java.in
@@ -114,7 +114,7 @@ public class Driver implements java.sql.Driver
       return null;
     
     try {
-	org.postgresql.Connection con = (org.postgresql.Connection)(Class.forName("%JDBCCONNECTCLASS%").newInstance());
+	org.postgresql.Connection con = (org.postgresql.Connection)(Class.forName("@JDBCCONNECTCLASS@").newInstance());
 	con.openConnection (host(), port(), props, database(), url, this);
 	return (java.sql.Connection)con;
     } catch(ClassNotFoundException ex) {
@@ -192,7 +192,7 @@ public class Driver implements java.sql.Driver
    */
   public int getMajorVersion()
   {
-    return %MAJORVERSION%;
+    return @MAJORVERSION@;
   }
   
   /**
@@ -202,7 +202,7 @@ public class Driver implements java.sql.Driver
    */
   public int getMinorVersion()
   {
-    return %MINORVERSION%;
+    return @MINORVERSION@;
   }
   
     /**
@@ -210,7 +210,7 @@ public class Driver implements java.sql.Driver
      */
     public static String getVersion()
     {
-	return "%VERSION%";
+	return "@VERSION@";
     }
     
   /**