[pkg-java] r10675 - trunk/libgnujmi-java/debian

[Niels Thykier]

Author: nthykier-guest
Date: 2009-09-27 21:18:16 +0000 (Sun, 27 Sep 2009)
New Revision: 10675

Modified:
   trunk/libgnujmi-java/debian/libgnujmi-java-doc.doc-base
   trunk/libgnujmi-java/debian/libgnujmi-java-doc.install
   trunk/libgnujmi-java/debian/rules
Log:
Cleaned up debian/rules, changed install location of the api.

Modified: trunk/libgnujmi-java/debian/libgnujmi-java-doc.doc-base
===================================================================
--- trunk/libgnujmi-java/debian/libgnujmi-java-doc.doc-base	2009-09-27 21:00:59 UTC (rev 10674)
+++ trunk/libgnujmi-java/debian/libgnujmi-java-doc.doc-base	2009-09-27 21:18:16 UTC (rev 10675)
@@ -6,5 +6,5 @@
 Section: Programming
 
 Format: HTML
-Index: /usr/share/doc/libgnujmi-java-doc/api/index.html
-Files: /usr/share/doc/libgnujmi-java-doc/api/*.html
+Index: /usr/share/doc/libgnujmi-java/api/index.html
+Files: /usr/share/doc/libgnujmi-java/api/*.html

Modified: trunk/libgnujmi-java/debian/libgnujmi-java-doc.install
===================================================================
--- trunk/libgnujmi-java/debian/libgnujmi-java-doc.install	2009-09-27 21:00:59 UTC (rev 10674)
+++ trunk/libgnujmi-java/debian/libgnujmi-java-doc.install	2009-09-27 21:18:16 UTC (rev 10675)
@@ -1 +1 @@
-api	/usr/share/doc/libgnujmi-java-doc/
+api	/usr/share/doc/libgnujmi-java/

Modified: trunk/libgnujmi-java/debian/rules
===================================================================
--- trunk/libgnujmi-java/debian/rules	2009-09-27 21:00:59 UTC (rev 10674)
+++ trunk/libgnujmi-java/debian/rules	2009-09-27 21:18:16 UTC (rev 10675)
@@ -6,21 +6,24 @@
 LIBRARY=jmi
 VERSION=1.0
 
+JAVA_HOME=/usr/lib/jvm/default-java
+
 configure:
 	dh_testdir
-	test -d classes || mkdir  classes
-	-find source -name \*.java > list.sources
+	mkdir -p classes
+	find source -name \*.java > list.sources
 
 build: build-stamp
 
 build-stamp:  configure
 	dh_testdir
 
-	javac -sourcepath source -d classes @list.sources 
-	jar -cf ${LIBRARY}-${VERSION}.jar -C classes javax
-	javadoc -d api -sourcepath source javax.jmi.corbaidltypes \
-		javax.jmi.model javax.jmi.primitivetypes javax.jmi.reflect \
-	 	javax.jmi.xmi
+	$(JAVA_HOME)/bin/javac -sourcepath source -d classes @list.sources 
+	$(JAVA_HOME)/bin/jar -cf ${LIBRARY}-${VERSION}.jar -C classes javax
+	$(JAVA_HOME)/bin/javadoc -d api -sourcepath source	\
+		javax.jmi.corbaidltypes javax.jmi.model		\
+		javax.jmi.primitivetypes javax.jmi.reflect	\
+		javax.jmi.xmi
 
 	touch build-stamp