diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index f4c94f2468db1329c2547fb45ed48b10952cb44d..b2350a427a7a06c8be2e265127ba957810b38130 100644
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.127 2001/05/12 17:49:32 petere Exp $
+# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.128 2001/05/25 14:28:58 momjian Exp $
 
 #------------------------------------------------------------------------------
 # All PostgreSQL makefiles include this file and use the variables it sets,
@@ -99,6 +99,8 @@ endif
 
 odbcinst_ini_dir = @odbcinst_ini_dir@
 
+javadir := $(DESTDIR)$(datadir)/java
+
 
 ##########################################################################
 #
diff --git a/src/interfaces/jdbc/Makefile b/src/interfaces/jdbc/Makefile
index b6311dd3a42b31ee1a0e34ccff3dcc6476ef81ee..c6e7fc6604a1d049189d2d48f1443ef135bb47da 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.30 2001/05/17 03:22:53 momjian Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/jdbc/Attic/Makefile,v 1.31 2001/05/25 14:28:58 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -23,7 +23,7 @@ all:
 	$(ANT) -buildfile $(top_srcdir)/build.xml $(properties)
 
 install: installdirs
-	$(ANT) -Dinstall.directory=$(DESTDIR)$(datadir)/java \
+	$(ANT) -Dinstall.directory=$(javadir) \
 		-buildfile $(top_srcdir)/build.xml \
 		install $(properties)
 
diff --git a/src/makefiles/Makefile.win b/src/makefiles/Makefile.win
index 8ebda2c08d27d904c98a6a13ea12f49c78c59722..626432b4351cdfdb68b4b4f47660af90e03e16da 100644
--- a/src/makefiles/Makefile.win
+++ b/src/makefiles/Makefile.win
@@ -1,4 +1,4 @@
-# $Header: /cvsroot/pgsql/src/makefiles/Attic/Makefile.win,v 1.11 2001/05/03 16:07:52 tgl Exp $
+# $Header: /cvsroot/pgsql/src/makefiles/Attic/Makefile.win,v 1.12 2001/05/25 14:28:58 momjian Exp $
 LDFLAGS+= -g
 DLLTOOL= dlltool
 DLLWRAP= dllwrap
@@ -27,3 +27,5 @@ endif
 ifeq ($(findstring ecpg/lib,$(subdir)), ecpg/lib)
 override CPPFLAGS+= -DBUILDING_DLL=1
 endif
+
+override javadir := '$(shell cygpath -w $(javadir))'