diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2003-12-17 12:39:34 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2003-12-17 12:39:34 +0000 |
| commit | ed42bda0937fdca0ea4e5e2a95b31ab0e7e145cb (patch) | |
| tree | 545675fe230be5ac6f59c443218a08360e98d734 /jvmaccess | |
| parent | 36843d67ae5f14240644c0fb832441cf5a78542a (diff) | |
INTEGRATION: CWS geordi2q11 (1.3.32); FILE MERGED
2003/12/16 12:49:52 hr 1.3.32.1: #111934#: join CWS ooo111fix1
Diffstat (limited to 'jvmaccess')
| -rw-r--r-- | jvmaccess/util/makefile.mk | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/jvmaccess/util/makefile.mk b/jvmaccess/util/makefile.mk index 41b836717214..0e6a87cc9ed6 100644 --- a/jvmaccess/util/makefile.mk +++ b/jvmaccess/util/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.4 $ # -# last change: $Author: vg $ $Date: 2003-06-12 09:50:08 $ +# last change: $Author: vg $ $Date: 2003-12-17 13:39:34 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -71,6 +71,12 @@ UNIXVERSIONNAMES = UDK .INCLUDE: settings.mk +.IF "$(SOLAR_JAVA)"=="" +nojava: + @echo "Not building jvmaccess because Java is disabled" +.ENDIF + + .IF "$(UNIXVERSIONNAMES)" == "" SHL1TARGET = $(TARGET)$(UDK_MAJOR)$(COMID) .ELSE # UNIXVERSIONNAMES |