diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-08-14 15:18:13 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-08-14 15:18:13 +0000 |
| commit | 4eab75571fd3f5e2a660ab8cfebad5e669855813 (patch) | |
| tree | 51eaad7487edd21a1374c67e1b5f137d8dc6521a /hsqldb | |
| parent | dd580b681a245d179f41dd6ddd56b4e277e77d9d (diff) | |
INTEGRATION: CWS ause061 (1.13.2); FILE MERGED
2006/07/17 15:01:56 hjs 1.13.2.1: #i67466# solve dmake 4.5 warning by correcting order
Diffstat (limited to 'hsqldb')
| -rwxr-xr-x | hsqldb/makefile.mk | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/hsqldb/makefile.mk b/hsqldb/makefile.mk index 25daab37ee4f..4726e5c1e2dd 100755 --- a/hsqldb/makefile.mk +++ b/hsqldb/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.13 $ +# $Revision: 1.14 $ # -# last change: $Author: obo $ $Date: 2006-07-10 19:01:25 $ +# last change: $Author: hr $ $Date: 2006-08-14 16:18:13 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -41,6 +41,10 @@ TARGET=so_hsqldb # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk + +# override buildfile +ANT_BUILDFILE=build$/build.xml + .INCLUDE : antsettings.mk .INCLUDE : version.mk @@ -63,9 +67,6 @@ PATCH_FILE_NAME=hsqldb_1_8_0 # src$/org$/hsqldb$/persist$/ScaledRAFileInJar.java \ # src$/org$/hsqldb$/test$/TestCollation.java -# override buildfile -ANT_BUILDFILE=build$/build.xml - .IF "$(JAVACISGCJ)"=="yes" JAVA_HOME= .EXPORT : JAVA_HOME |