summaryrefslogtreecommitdiff
path: root/scripting/examples
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2005-01-25 14:08:56 +0000
committerOliver Bolte <obo@openoffice.org>2005-01-25 14:08:56 +0000
commitcda861666c2e56a35b891236b67112135b3b8802 (patch)
tree51c434321157cbda32372e305428d98ec91e6e8f /scripting/examples
parent4143eec9cf2b12149559dceb8190be177bc8fe97 (diff)
INTEGRATION: CWS gcj1 (1.5.42); FILE MERGED
2005/01/06 20:24:30 cmc 1.5.42.2: RESYNC: (1.5-1.6); FILE MERGED 2004/12/08 08:07:30 cmc 1.5.42.1: #i38188# minor tweak for gcj
Diffstat (limited to 'scripting/examples')
-rwxr-xr-xscripting/examples/makefile.mk6
1 files changed, 4 insertions, 2 deletions
diff --git a/scripting/examples/makefile.mk b/scripting/examples/makefile.mk
index e408746db2..abf15a8d9d 100755
--- a/scripting/examples/makefile.mk
+++ b/scripting/examples/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.6 $
+# $Revision: 1.7 $
#
-# last change: $Author: vg $ $Date: 2004-12-23 11:44:35 $
+# last change: $Author: obo $ $Date: 2005-01-25 15:08:56 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -67,11 +67,13 @@ no_common_build_zip=true
.INCLUDE : settings.mk
.IF "$(SOLAR_JAVA)"!=""
+.IF "$(JDK)"!="gcj"
ZIP1FLAGS=-r
ZIP1TARGET=ScriptsJava
ZIP1DIR=$(OUT)$/class$/examples
ZIP1LIST=java
.ENDIF
+.ENDIF
ZIP2FLAGS=-r
ZIP2TARGET=ScriptsBeanShell