[sword-svn] r1882 - in trunk/bindings: . corba/java

[dglassey at crosswire.org]

Author: dglassey
Date: 2006-01-06 07:20:16 -0700 (Fri, 06 Jan 2006)
New Revision: 1882

Modified:
   trunk/bindings/corba/java/Makefile.in
   trunk/bindings/usrinst.sh
Log:
sun java is required
should work now



Modified: trunk/bindings/corba/java/Makefile.in
===================================================================
--- trunk/bindings/corba/java/Makefile.in	2006-01-06 13:40:48 UTC (rev 1881)
+++ trunk/bindings/corba/java/Makefile.in	2006-01-06 14:20:16 UTC (rev 1882)
@@ -5,6 +5,7 @@
 top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
 INSTALL = @INSTALL@
+JAR = @JAR@
 
 #SWORDORBJAR=sword-orb-$(VERSION).jar
 SWORDORBJAR=sword-orb.jar
@@ -15,7 +16,8 @@
 	idlj -pkgTranslate swordorb org.crosswire.sword.orb -td src $(top_srcdir)/corba/swordorb.idl
 
 classes/org/crosswire/sword/orb/SwordOrb.class: src/org/crosswire/sword/orb/SWMgr.java
-	$(JAVAC) -classpath ${TOMCAT_HOME}/common/lib/servlet-api.jar -d classes src/org/crosswire/sword/orb/*.java src/org/crosswire/util/*.java
+	mkdir -p $(top_builddir)/corba/java/classes
+	$(JAVAC) -classpath ${TOMCAT_HOME}/common/lib/servlet-api.jar -d $(top_builddir)/corba/java/classes src/org/crosswire/sword/orb/*.java src/org/crosswire/util/*.java
 
 $(top_builddir)/corba/java/src/org/crosswire/util/Base64.java:
 	cp -a $(top_srcdir)/corba/java/src .
@@ -32,7 +34,7 @@
 	-rm $(SWORDORBJAR)
 
 $(SWORDORBJAR): classes/org/crosswire/sword/orb/SwordOrb.class
-	$(JAR) cf $(SWORDORBJAR) -C $(top_srcdir)/classes org
+	$(JAR) cf $(SWORDORBJAR) -C $(top_builddir)/corba/java/classes org
 
 install:
 	@INSTALL@ $(SWORDORBJAR) $(TOMCAT_HOME)/common/lib

Modified: trunk/bindings/usrinst.sh
===================================================================
--- trunk/bindings/usrinst.sh	2006-01-06 13:40:48 UTC (rev 1881)
+++ trunk/bindings/usrinst.sh	2006-01-06 14:20:16 UTC (rev 1882)
@@ -3,5 +3,5 @@
 OPTIONS="--prefix=/usr $OPTIONS"
 OPTIONS="--enable-corba $OPTIONS"
 
-CPPFLAGS="$CFLAGS $CPPFLAGS" ./configure $OPTIONS $*
+CPPFLAGS="$CFLAGS $CPPFLAGS" JAVAC=javac ./configure $OPTIONS $*