diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-07-14 10:42:39 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-07-14 10:42:39 +0000 |
| commit | 163de22a857a84952951327e3711c0aa9ce9a1b5 (patch) | |
| tree | b1c66050fb66111b464e61d102dc44858c1c0ac5 /hsqldb | |
| parent | 8591ec3b1bd2e49e432450bba0271efbe6b7139b (diff) | |
INTEGRATION: CWS hsqldb5 (1.7.2); FILE MERGED
2005/07/05 12:39:08 oj 1.7.2.1: #i51409# apply patch from cloph
Diffstat (limited to 'hsqldb')
| -rwxr-xr-x | hsqldb/makefile.mk | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/hsqldb/makefile.mk b/hsqldb/makefile.mk index 60e15792ff7a..afab9677ef8a 100755 --- a/hsqldb/makefile.mk +++ b/hsqldb/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.7 $ +# $Revision: 1.8 $ # -# last change: $Author: rt $ $Date: 2005-06-27 08:26:45 $ +# last change: $Author: kz $ $Date: 2005-07-14 11:42:39 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -67,6 +67,7 @@ TARGET=so_hsqldb .INCLUDE : settings.mk .INCLUDE : version.mk +.INCLUDE : minor.mk .IF "$(SOLAR_JAVA)" != "" # --- Files -------------------------------------------------------- @@ -101,9 +102,9 @@ ANT_BUILDFILE=build$/build.xml .IF "$(JDK)"=="gcj" JAVA_HOME= .EXPORT : JAVA_HOME -BUILD_ACTION=$(ANT) -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar +BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj -f $(ANT_BUILDFILE) jar .ELSE -BUILD_ACTION=$(ANT) -f $(ANT_BUILDFILE) jar +BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -f $(ANT_BUILDFILE) jar .ENDIF .ENDIF # $(SOLAR_JAVA)!= "" |