diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-03-09 11:06:44 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-03-09 11:06:44 +0000 |
| commit | a21b5db6583f09f14a5d6196f922143e16c62dbc (patch) | |
| tree | bc6fcacc40900745963d46a76c91ee5964bdcf8a | |
| parent | e80480620e6feb204e75daa33e747664edc9c825 (diff) | |
INTEGRATION: CWS ooo20040225 (1.2.16); FILE MERGED
2004/03/01 15:44:16 hr 1.2.16.2: RESYNC: (1.2-1.3); FILE MERGED
2004/02/25 10:38:32 haggai 1.2.16.1: #i25829# Fix scripting build without Java support ($SOLAR_JAVA!=TRUE)
| -rwxr-xr-x | scripting/examples/makefile.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/scripting/examples/makefile.mk b/scripting/examples/makefile.mk index c60aa6bef404..b46b26c2d2be 100755 --- a/scripting/examples/makefile.mk +++ b/scripting/examples/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.4 $ # -# last change: $Author: rt $ $Date: 2004-02-10 16:03:47 $ +# last change: $Author: hr $ $Date: 2004-03-09 12:06:44 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -67,10 +67,12 @@ no_common_build_zip=true .INCLUDE : settings.mk +.IF "$(SOLAR_JAVA)"!="" ZIP1FLAGS=-r ZIP1TARGET=ScriptsJava ZIP1DIR=$(OUT)$/class/examples ZIP1LIST=java +.ENDIF ZIP2FLAGS=-r ZIP2TARGET=ScriptsBeanShell |