[pkg-java] r7021 - trunk/libjava3d-java/debian

[pere at alioth.debian.org]

Author: pere
Date: 2008-09-20 13:37:19 +0000 (Sat, 20 Sep 2008)
New Revision: 7021

Modified:
   trunk/libjava3d-java/debian/rules
Log:
Get build working.

Modified: trunk/libjava3d-java/debian/rules
===================================================================
--- trunk/libjava3d-java/debian/rules	2008-09-20 13:19:30 UTC (rev 7020)
+++ trunk/libjava3d-java/debian/rules	2008-09-20 13:37:19 UTC (rev 7021)
@@ -4,30 +4,25 @@
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
-JAVA_HOME_DIRS := /usr/lib/jvm/default-java /usr/lib/jvm/java-6-sun
+JAVA_HOME_DIRS := /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-sun /usr/lib/jvm/default-java
 
 JAVAH := /usr/lib/jvm/java-6-sun/bin/javah
 
-DEB_JARS             := ant-launcher vecmath
+DEB_JARS             := ant-launcher ant-nodeps vecmath
 DEB_ANT_CLEAN_TARGET := clean
 DEB_ANT_BUILD_TARGET := jar
 DEB_BUILDDIR         := j3d-core
 
 install/libjava3d-java::
-	install -m 644 -D java3d/build/java3d.jar debian/libjava3d-java/usr/share/java/java3d-$(DEB_UPSTREAM_VERSION).jar
-	ln -s java3d-$(DEB_UPSTREAM_VERSION).jar debian/libjava3d-java/usr/share/java/java3d.jar
-	install -m 644 -D gluegen/build/gluegen-rt.jar debian/libjava3d-java/usr/share/java/gluegen-rt-$(DEB_UPSTREAM_VERSION).jar
-	ln -s gluegen-rt-$(DEB_UPSTREAM_VERSION).jar debian/libjava3d-java/usr/share/java/gluegen-rt.jar
+	for jar in j3dcore j3dutils ; do \
+	    install -m 644 -D java3d/build/default/opt/lib/ext/$$jar.jar debian/libjava3d-java/usr/share/java/$$jar-$(DEB_UPSTREAM_VERSION).jar; \
+	    ln -s $$jar-$(DEB_UPSTREAM_VERSION).jar debian/libjava3d-java/usr/share/java/$$jar.jar ; \
+	done
 
 install/libjava3d-jni::
-	install -m 644 -D java3d/build/obj/libjava3d.so debian/libjava3d-jni/usr/lib/jni/libjava3d.so
-	install -m 644 -D java3d/build/obj/libjava3d_awt.so debian/libjava3d-jni/usr/lib/jni/libjava3d_awt.so
-# Commented since Cg is not available under Debian
-#	install -m 644 -D java3d/build/obj/libjava3d_cg.so debian/libjava3d-jni/usr/lib/jni/libjava3d_cg.so
-	install -m 644 -D gluegen/build/obj/libgluegen-rt.so debian/libjava3d-jni/usr/lib/jni/libgluegen-rt.so
+	install -m 644 -D ./j3d-core/build/default/opt/native/libj3dcore-ogl.so debian/libjava3d-jni/usr/lib/jni/libj3dcore-ogl.so
 
 clean::
-	$(RM) -r gluegen/build
 
 get-orig-source::
 	@ echo "Password for the guest CVS user is an empty password (press [enter])"