diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-01-31 17:42:02 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-01-31 17:42:02 +0000 |
| commit | 2fc9fb270afe825f78c50d14ae352fdacc6b5a03 (patch) | |
| tree | a127f762f821ad3189081cdfeeef8e221394b12f /hsqldb | |
| parent | d01913cb14fa7465da77acaab0e9d0e3cd498f67 (diff) | |
INTEGRATION: CWS dba202d (1.10.8); FILE MERGED
2005/12/27 12:21:33 oj 1.10.8.2: #i58184# fix for ON DELETE SET DEFAULT
2005/12/13 15:48:51 oj 1.10.8.1: #i57406# makefile patched
Diffstat (limited to 'hsqldb')
| -rwxr-xr-x | hsqldb/makefile.mk | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/hsqldb/makefile.mk b/hsqldb/makefile.mk index 1cdb90159bc4..0b374ddc27b1 100755 --- a/hsqldb/makefile.mk +++ b/hsqldb/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.10 $ +# $Revision: 1.11 $ # -# last change: $Author: rt $ $Date: 2005-09-07 16:27:52 $ +# last change: $Author: kz $ $Date: 2006-01-31 18:42:02 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -41,6 +41,8 @@ TARGET=so_hsqldb # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk +.INCLUDE : antsettings.mk + .INCLUDE : version.mk .INCLUDE : minor.mk @@ -51,7 +53,9 @@ TARFILE_NAME=hsqldb_$(HSQLDB_VERSION) TARFILE_ROOTDIR=hsqldb -CONVERTFILES=build$/build.xml +CONVERTFILES=build$/build.xml\ + doc/changelist_1_8_0.txt\ + src/org/hsqldb/resources/sql-error-messages_it.properties PATCH_FILE_NAME=hsqldb_1_8_0 # ADDITIONAL_FILES= src$/org$/hsqldb$/Collation.java \ @@ -60,19 +64,7 @@ PATCH_FILE_NAME=hsqldb_1_8_0 # src$/org$/hsqldb$/persist$/ScaledRAFileInJar.java \ # src$/org$/hsqldb$/test$/TestCollation.java -.IF "$(ANT_HOME)" == "" -ANT_HOME*:=$(COMMON_BUILD_TOOLS)$/apache-ant-1.6.1 -.EXPORT : ANT_HOME -.ENDIF -ANT_LIB*:=$(ANT_HOME)$/lib - -ANT_CLASSPATH:=$(ANT_LIB)$/xercesImpl.jar$(PATH_SEPERATOR)$(ANT_LIB)$/xml-apis.jar$(PATH_SEPERATOR)$(ANT_LIB)$/ant.jar -PATH!:=$(ANT_HOME)$/bin$(PATH_SEPERATOR)$(PATH) - -.IF "$(ANT)" == "" -ANT*:=$(ANT_HOME)$/bin$/ant -.ENDIF - +# override buildfile ANT_BUILDFILE=build$/build.xml .IF "$(JDK)"=="gcj" |