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)
This commit is contained in:
@@ -2,9 +2,9 @@
|
|||||||
#
|
#
|
||||||
# $RCSfile: makefile.mk,v $
|
# $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
|
# The Contents of this file are made available subject to the terms of
|
||||||
# either of the following licenses
|
# either of the following licenses
|
||||||
@@ -67,10 +67,12 @@ no_common_build_zip=true
|
|||||||
|
|
||||||
.INCLUDE : settings.mk
|
.INCLUDE : settings.mk
|
||||||
|
|
||||||
|
.IF "$(SOLAR_JAVA)"!=""
|
||||||
ZIP1FLAGS=-r
|
ZIP1FLAGS=-r
|
||||||
ZIP1TARGET=ScriptsJava
|
ZIP1TARGET=ScriptsJava
|
||||||
ZIP1DIR=$(OUT)$/class/examples
|
ZIP1DIR=$(OUT)$/class/examples
|
||||||
ZIP1LIST=java
|
ZIP1LIST=java
|
||||||
|
.ENDIF
|
||||||
|
|
||||||
ZIP2FLAGS=-r
|
ZIP2FLAGS=-r
|
||||||
ZIP2TARGET=ScriptsBeanShell
|
ZIP2TARGET=ScriptsBeanShell
|
||||||
|
Reference in New Issue
Block a user