opensourcemirror
/
postgresql
mirror of git://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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
This commit is contained in:
Bruce Momjian 2001-05-25 14:28:58 +00:00
parent e5cff3fe64
commit 74068dfed6
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Makefile.global.in
View File

@ -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
##########################################################################
#

4
src/interfaces/jdbc/Makefile
View File

@ -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)

4
src/makefiles/Makefile.win
View File

@ -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))'