Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit74068df

Browse files
committed
The following patch corrects a make install problem when building
under Cygwin. The root cause of this problem is that (Sun) java is anative Win32 app and hence does not understand Cygwin Posix style paths.The solution is to use Cygwin's cygpath utility to convert the Posix styleJDBC 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 butmy goal was to confine the Cygwin specific constructs toJason Tishler
1 parente5cff3f commit74068df

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

‎src/Makefile.global.in

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -*-makefile-*-
2-
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.127 2001/05/12 17:49:32 petere Exp $
2+
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.128 2001/05/25 14:28:58 momjian Exp $
33

44
#------------------------------------------------------------------------------
55
# All PostgreSQL makefiles include this file and use the variables it sets,
@@ -99,6 +99,8 @@ endif
9999

100100
odbcinst_ini_dir = @odbcinst_ini_dir@
101101

102+
javadir :=$(DESTDIR)$(datadir)/java
103+
102104

103105
##########################################################################
104106
#

‎src/interfaces/jdbc/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# Copyright (c) 1994, Regents of the University of California
66
#
7-
# $Header: /cvsroot/pgsql/src/interfaces/jdbc/Attic/Makefile,v 1.30 2001/05/17 03:22:53 momjian Exp $
7+
# $Header: /cvsroot/pgsql/src/interfaces/jdbc/Attic/Makefile,v 1.31 2001/05/25 14:28:58 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -23,7 +23,7 @@ all:
2323
$(ANT) -buildfile$(top_srcdir)/build.xml$(properties)
2424

2525
install: installdirs
26-
$(ANT) -Dinstall.directory=$(DESTDIR)$(datadir)/java\
26+
$(ANT) -Dinstall.directory=$(javadir)\
2727
-buildfile$(top_srcdir)/build.xml\
2828
install$(properties)
2929

‎src/makefiles/Makefile.win

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $Header: /cvsroot/pgsql/src/makefiles/Attic/Makefile.win,v 1.11 2001/05/03 16:07:52 tgl Exp $
1+
# $Header: /cvsroot/pgsql/src/makefiles/Attic/Makefile.win,v 1.12 2001/05/25 14:28:58 momjian Exp $
22
LDFLAGS+= -g
33
DLLTOOL= dlltool
44
DLLWRAP= dllwrap
@@ -27,3 +27,5 @@ endif
2727
ifeq ($(findstring ecpg/lib,$(subdir)), ecpg/lib)
2828
override CPPFLAGS+= -DBUILDING_DLL=1
2929
endif
30+
31+
override javadir := '$(shell cygpath -w $(javadir))'

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp