diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-11-26 12:10:37 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-11-26 12:10:37 +0000 |
| commit | 1920e68128792b695c1fe35eea2522c04a41aa80 (patch) | |
| tree | 46ae44d67535b567738f37efc1e28c82a0a43de7 /hsqldb | |
| parent | 74ea4f2be746ea8d192a95a83eb91e02ea39f90b (diff) | |
INTEGRATION: CWS nojava2 (1.1.2); FILE MERGED
2004/11/16 15:31:41 haggai 1.1.2.1: #i37259# javaless build failure
Diffstat (limited to 'hsqldb')
| -rwxr-xr-x | hsqldb/makefile.mk | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/hsqldb/makefile.mk b/hsqldb/makefile.mk index db7c3ea4eb5a..e61111ff75ff 100755 --- a/hsqldb/makefile.mk +++ b/hsqldb/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.1 $ +# $Revision: 1.2 $ # -# last change: $Author: oj $ $Date: 2004-11-09 13:57:41 $ +# last change: $Author: rt $ $Date: 2004-11-26 13:10:37 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -68,9 +68,10 @@ TARGET=so_hsqldb .INCLUDE : settings.mk .INCLUDE : version.mk -.IF "$(SOLAR_JAVA)" != "" # --- Files -------------------------------------------------------- +.IF "$(SOLAR_JAVA)" != "" + TARFILE_NAME=hsqldb_$(HSQLDB_VERSION) PATCH_FILE_NAME=hsqldb_$(HSQLDB_VERSION).patch @@ -97,12 +98,14 @@ ANT_BUILDFILE=build$/build.xml BUILD_ACTION=$(ANT) -f $(ANT_BUILDFILE) jar -.ENDIF +.ENDIF # $(SOLAR_JAVA)!= "" # --- Targets ------------------------------------------------------ .INCLUDE : set_ext.mk .INCLUDE : target.mk -.INCLUDE : tg_ext.mk +.IF "$(SOLAR_JAVA)" != "" +.INCLUDE : tg_ext.mk +.ENDIF |