diff options
| author | Bruce Momjian <bruce@momjian.us> | 2001-05-25 14:28:58 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2001-05-25 14:28:58 +0000 |
| commit | 74068dfed65c3a681cb2724ad320d007d3dbb662 (patch) | |
| tree | 5732b4fe5b26ad5dce8f19b72c2fea01cbcc2496 /src | |
| parent | e5cff3fe641c35d4a1f73c9c79679799098edb41 (diff) | |
| download | postgresql-74068dfed65c3a681cb2724ad320d007d3dbb662.tar.gz postgresql-74068dfed65c3a681cb2724ad320d007d3dbb662.zip | |
The following patch corrects a make install problem when building
under Cygwin. The root cause of this problem is that (Sun) java is a
native Win32 app and hence does not understand Cygwin Posix style paths.
The solution is to use Cygwin's cygpath utility to convert the Posix style
JDBC installation directory path into a Win32 one before invoking ant.
I'm not sure if my patch is the best way to correct this issue but
my goal was to confine the Cygwin specific constructs to
Jason Tishler
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.global.in | 4 | ||||
| -rw-r--r-- | src/interfaces/jdbc/Makefile | 4 | ||||
| -rw-r--r-- | src/makefiles/Makefile.win | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/src/Makefile.global.in b/src/Makefile.global.in index f4c94f2468d..b2350a427a7 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 b6311dd3a42..c6e7fc6604a 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 8ebda2c08d2..626432b4351 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))' |