3 files changed, 37 insertions, 16 deletions
diff --git a/src/interfaces/jdbc/Makefile b/src/interfaces/jdbc/Makefile
index c88ad683399..cdb9a82e44f 100644
--- a/src/interfaces/jdbc/Makefile
+++ b/src/interfaces/jdbc/Makefile
@@ -4,7 +4,7 @@
 #
 # Copyright (c) 1994, Regents of the University of California
 #
-# $Header: /cvsroot/pgsql/src/interfaces/jdbc/Attic/Makefile,v 1.27 2001/03/05 09:39:53 peter Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/jdbc/Attic/Makefile,v 1.28 2001/03/11 11:07:00 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -12,17 +12,28 @@ subdir = src/interfaces/jdbc
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
-all distprep:
-	@$(ANT) -buildfile $(top_builddir)/build.xml
+majorversion := $(shell echo $(VERSION) | sed 's/^\([0-9][0-9]*\)\..*$$/\1/')
+minorversion := $(shell echo $(VERSION) | sed 's/^[0-9][0-9]*\.\([0-9][0-9]*\).*$$/\1/')
 
-install:
-	@$(ANT) -Dinstall.directory=$(DESTDIR)$(libdir)/java \
-		-buildfile $(top_builddir)/build.xml \
-		install
+properties := -Dmajor=$(majorversion) -Dminor=$(minorversion) \
+		-Dfullversion=$(VERSION) \
+		-Ddef_pgport=$(DEF_PGPORT)
 
-installdirs uninstall dep depend:
-	@echo Nothing for JDBC
+all:
+	$(ANT) -buildfile $(top_srcdir)/build.xml $(properties)
 
-clean distclean maintainer-clean:
-	@$(ANT) -buildfile $(top_builddir)/build.xml clean
+install: installdirs
+	$(ANT) -Dinstall.directory=$(DESTDIR)$(datadir)/java \
+		-buildfile $(top_srcdir)/build.xml \
+		install $(properties)
+
+installdirs:
+	$(mkinstalldirs) $(DESTDIR)$(datadir)/java
 
+uninstall:
+	$(ANT) -Dinstall.directory=$(DESTDIR)$(datadir)/java \
+		-buildfile $(top_srcdir)/build.xml \
+		uninstall
+
+clean distclean maintainer-clean:
+	$(ANT) -buildfile $(top_srcdir)/build.xml clean
diff --git a/src/interfaces/jdbc/build.xml b/src/interfaces/jdbc/build.xml
index ef2c45ceb1c..54ed7144196 100644
--- a/src/interfaces/jdbc/build.xml
+++ b/src/interfaces/jdbc/build.xml
@@ -3,7 +3,7 @@
   build file to allow ant (http://jakarta.apache.org/ant/) to be used
   to build the PostgreSQL JDBC Driver.
 
-  $Id: build.xml,v 1.7 2001/03/05 09:40:01 peter Exp $
+  $Id: build.xml,v 1.8 2001/03/11 11:07:00 petere Exp $
 
 -->
 
@@ -14,8 +14,6 @@
   <property name="jars"    value="jars" />
   <property name="dest"    value="build" />
   <property name="package" value="org/postgresql" />
-  <property name="major" value="7" />
-  <property name="minor" value="1" />
 
   <!--
     defaults for the tests - overide these if required
@@ -68,8 +66,9 @@
     <!-- Some defaults -->
     <filter token="MAJORVERSION" value="${major}" />
     <filter token="MINORVERSION" value="${minor}" />
-    <filter token="VERSION" value="PostgreSQL ${major}.${minor} ${edition}" />
+    <filter token="VERSION" value="PostgreSQL ${fullversion} ${edition}" />
     <filter token="JDBCCONNECTCLASS" value="${connectclass}" />
+    <filter token="DEF_PGPORT" value="${def_pgport}" />
 
     <!-- Put a check for the current version here -->
 
@@ -154,6 +153,17 @@
   </target>
 
   <!--
+    Uninstall the jar file.
+  -->
+  <target name="uninstall" if="install.directory">
+    <delete>
+      <fileset dir="${install.directory}">
+        <include name="**/*.jar" />
+      </fileset>
+    </delete>
+  </target>
+
+  <!--
     This compiles and executes the JUnit tests
   -->
   <target name="test" depends="jar" if="junit">
diff --git a/src/interfaces/jdbc/org/postgresql/Driver.java.in b/src/interfaces/jdbc/org/postgresql/Driver.java.in
index d7452c6752f..5d64a3f579b 100644
--- a/src/interfaces/jdbc/org/postgresql/Driver.java.in
+++ b/src/interfaces/jdbc/org/postgresql/Driver.java.in
@@ -351,7 +351,7 @@ public class Driver implements java.sql.Driver
    */
   public int port()
   {
-    return Integer.parseInt(props.getProperty("PGPORT","5432"));
+    return Integer.parseInt(props.getProperty("PGPORT","@DEF_PGPORT@"));
   }
 
   /**