summaryrefslogtreecommitdiff
path: root/rhino
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2005-01-25 14:16:22 +0000
committerOliver Bolte <obo@openoffice.org>2005-01-25 14:16:22 +0000
commit79c1c9e3ae04e0b3fc80a343ce7ae1d56d60ad6e (patch)
treef5d88a75b492eae4b65255d3fa9d1ed48899dde1 /rhino
parent6d100d5ff853cc3fc1b35a8b8b879350542197dd (diff)
INTEGRATION: CWS gcj1 (1.2.2); FILE MERGED
2004/12/01 12:21:14 cmc 1.2.2.1: #i38188# This dir cannot be build with gcj because of javax.swing.JTextArea.replaceRange
Diffstat (limited to 'rhino')
-rwxr-xr-xrhino/makefile.mk13
1 files changed, 7 insertions, 6 deletions
diff --git a/rhino/makefile.mk b/rhino/makefile.mk
index 3ffd7a803fb7..5dac26484988 100755
--- a/rhino/makefile.mk
+++ b/rhino/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.2 $
+# $Revision: 1.3 $
#
-# last change: $Author: hr $ $Date: 2004-11-09 11:50:38 $
+# last change: $Author: obo $ $Date: 2005-01-25 15:16:22 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -65,14 +65,15 @@ PRJNAME=so_rhino
TARGET=so_rhino
.IF "$(SOLAR_JAVA)"!=""
-
+.IF "$(JDK)" == "gcj"
+all:
+ @echo This dir cannot be build with gcj because of javax.swing.JTextArea.replaceRange
+.ELSE
.INCLUDE : ant.mk
ALLTAR : ANTBUILD
-
+.ENDIF
.ELSE
-
all:
@echo java disabled
-
.ENDIF