diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-09 10:50:38 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-09 10:50:38 +0000 |
| commit | 2c55b3e4c7ed6a340405e6639a07e6484e065cbc (patch) | |
| tree | a58a20aefc46847c74dd78d9d6b56ed601cdc785 | |
| parent | d873110b256f84a0721e2fb97f34e22cc9a53a5a (diff) | |
INTEGRATION: CWS nojava1 (1.1.38); FILE MERGED
2004/08/16 13:36:23 cmc 1.1.38.1: #i33045# rhino needs ant, and ant needs java
| -rwxr-xr-x | rhino/makefile.mk | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/rhino/makefile.mk b/rhino/makefile.mk index 35fd8b707e78..3ffd7a803fb7 100755 --- a/rhino/makefile.mk +++ b/rhino/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.1 $ +# $Revision: 1.2 $ # -# last change: $Author: toconnor $ $Date: 2003-11-28 15:11:49 $ +# last change: $Author: hr $ $Date: 2004-11-09 11:50:38 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -64,7 +64,15 @@ PRJ=. PRJNAME=so_rhino TARGET=so_rhino +.IF "$(SOLAR_JAVA)"!="" + .INCLUDE : ant.mk ALLTAR : ANTBUILD +.ELSE + +all: + @echo java disabled + +.ENDIF |