diff options
| author | Oliver Bolte <obo@openoffice.org> | 2005-01-25 14:11:29 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2005-01-25 14:11:29 +0000 |
| commit | 6d100d5ff853cc3fc1b35a8b8b879350542197dd (patch) | |
| tree | 3cea1c3cfcf591af97ca9c88319fd41cc1de91f3 /hsqldb | |
| parent | c48265de34e55a3f6379cf1fb8278068de7e48d0 (diff) | |
INTEGRATION: CWS gcj1 (1.1.4); FILE MERGED
2005/01/06 20:37:50 cmc 1.1.4.2: RESYNC: (1.1-1.2); FILE MERGED
2004/12/01 11:51:24 cmc 1.1.4.1: #i38188# This dir cannot be build with gcj because of sun.security.action.GetPropertyAction
Diffstat (limited to 'hsqldb')
| -rwxr-xr-x | hsqldb/makefile.mk | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/hsqldb/makefile.mk b/hsqldb/makefile.mk index e61111ff75ff..7c840059752b 100755 --- a/hsqldb/makefile.mk +++ b/hsqldb/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.3 $ # -# last change: $Author: rt $ $Date: 2004-11-26 13:10:37 $ +# last change: $Author: obo $ $Date: 2005-01-25 15:11:29 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -71,6 +71,11 @@ TARGET=so_hsqldb # --- Files -------------------------------------------------------- .IF "$(SOLAR_JAVA)" != "" +.IF "$(JDK)" == "gcj" +all: + @echo This dir cannot be build with gcj because of sun.security.action.GetPropertyAction +.ELSE +# --- Files -------------------------------------------------------- TARFILE_NAME=hsqldb_$(HSQLDB_VERSION) PATCH_FILE_NAME=hsqldb_$(HSQLDB_VERSION).patch @@ -98,6 +103,7 @@ ANT_BUILDFILE=build$/build.xml BUILD_ACTION=$(ANT) -f $(ANT_BUILDFILE) jar +.ENDIF .ENDIF # $(SOLAR_JAVA)!= "" # --- Targets ------------------------------------------------------ |