Index: Makefile.global.in =================================================================== RCS file: /home/projects/pgsql/cvsroot/pgsql/src/Makefile.global.in,v retrieving revision 1.127 diff -u -p -r1.127 Makefile.global.in --- Makefile.global.in 2001/05/12 17:49:32 1.127 +++ Makefile.global.in 2001/05/24 14:52:34 @@ -99,6 +99,8 @@ endif odbcinst_ini_dir = @odbcinst_ini_dir@ +javadir := $(DESTDIR)$(datadir)/java + ########################################################################## # Index: interfaces/jdbc/Makefile =================================================================== RCS file: /home/projects/pgsql/cvsroot/pgsql/src/interfaces/jdbc/Makefile,v retrieving revision 1.30 diff -u -p -r1.30 Makefile --- interfaces/jdbc/Makefile 2001/05/17 03:22:53 1.30 +++ interfaces/jdbc/Makefile 2001/05/24 14:52:34 @@ -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) Index: makefiles/Makefile.win =================================================================== RCS file: /home/projects/pgsql/cvsroot/pgsql/src/makefiles/Makefile.win,v retrieving revision 1.11 diff -u -p -r1.11 Makefile.win --- makefiles/Makefile.win 2001/05/03 16:07:52 1.11 +++ makefiles/Makefile.win 2001/05/24 14:52:34 @@ -27,3 +27,5 @@ endif ifeq ($(findstring ecpg/lib,$(subdir)), ecpg/lib) override CPPFLAGS+= -DBUILDING_DLL=1 endif + +override javadir := '$(shell cygpath -w $(javadir))'