[patch] jdbc build fix when ./configure is run in separate dir

Started by Nonamealmost 22 years ago2 messages
#1Noname
tim@keow.org
1 attachment(s)

When ./configure is run outside the source directory
(to keep the build files separate from the source files),
make fails for the jdbc target because ant is not informed
of the configure/build directory location.

This patch fixes this, but could you please review it
for portability, etc. For example, I am not sure that
`pwd` is the best way to find the configure/build dir.

HTH
--Tim Larson

Attachments:

jdbc.difftext/plain; charset=us-asciiDownload
Index: Makefile
===================================================================
RCS file: /projects/cvsroot/pgsql-server/src/interfaces/jdbc/Makefile,v
retrieving revision 1.39
diff -r1.39 Makefile
27c27,28
< 	$(ANT) -buildfile $(srcdir)/build.xml all
---
> 	$(ANT) -buildfile $(srcdir)/build.xml all \
> 	  -Dconfig.directory=`pwd`
30a32
> 	  -Dconfig.directory=`pwd` \
41c43,44
< 	$(ANT) -buildfile $(srcdir)/build.xml clean_all
---
> 	$(ANT) -buildfile $(srcdir)/build.xml clean_all \
> 	  -Dconfig.directory=`pwd`
44c47,48
< 	$(ANT) -buildfile $(srcdir)/build.xml test
---
> 	$(ANT) -buildfile $(srcdir)/build.xml test \
> 	  -Dconfig.directory=`pwd`
Index: build.xml
===================================================================
RCS file: /projects/cvsroot/pgsql-server/src/interfaces/jdbc/build.xml,v
retrieving revision 1.38
diff -r1.38 build.xml
21,22c21,22
<   <property name="jardir"  value="jars" />
<   <property name="builddir" value="build" />
---
>   <property name="jardir"  value="${config.directory}/jars" />
>   <property name="builddir" value="${config.directory}/build" />
26c26
<   <property file="build.properties"/>
---
>   <property file="${config.directory}/build.properties"/>
#2Bruce Momjian
pgman@candle.pha.pa.us
In reply to: Noname (#1)
Re: [patch] jdbc build fix when ./configure is run in separate

tim@keow.org wrote:

When ./configure is run outside the source directory
(to keep the build files separate from the source files),
make fails for the jdbc target because ant is not informed
of the configure/build directory location.

This patch fixes this, but could you please review it
for portability, etc. For example, I am not sure that
`pwd` is the best way to find the configure/build dir.

JDBC is moving to gborg for 7.5 so this patch isn't required.

-- 
  Bruce Momjian                        |  http://candle.pha.pa.us
  pgman@candle.pha.pa.us               |  (610) 359-1001
  +  If your life is a hard drive,     |  13 Roberts Road
  +  Christ can be your backup.        |  Newtown Square, Pennsylvania 19073