[pkg-java] r10669 - trunk/libjibx-java/debian

[Michael Koch]

Author: mkoch
Date: 2009-09-27 19:40:23 +0000 (Sun, 27 Sep 2009)
New Revision: 10669

Modified:
   trunk/libjibx-java/debian/rules
Log:
fix building and installation of jars

Modified: trunk/libjibx-java/debian/rules
===================================================================
--- trunk/libjibx-java/debian/rules	2009-09-27 18:31:57 UTC (rev 10668)
+++ trunk/libjibx-java/debian/rules	2009-09-27 19:40:23 UTC (rev 10669)
@@ -8,6 +8,7 @@
 JAVA_HOME            := /usr/lib/jvm/java-6-openjdk
 DEB_JARS             := $(ANT_HOME)/lib/ant-launcher.jar bcel log4j qdox xpp3
 DEB_ANT_BUILD_TARGET := setrelease current devdoc
+DEB_ANT_ARGS         := -Dbindname=jibx-bind-$(DEB_UPSTREAM_VERSION) -Dextrasname=jibx-extras-$(DEB_UPSTREAM_VERSION) -Drunname=jibx-run-$(DEB_UPSTREAM_VERSION) -Dschemaname=jibx-schema-$(DEB_UPSTREAM_VERSION)
 DEB_BUILDDIR         := build
 DEB_DH_INSTALLCHANGELOGS_ARGS := changes.txt
 
@@ -15,11 +16,11 @@
 	-rm -fr build/api build/classes lib/*
 
 install/libjibx-java::
-	dh_install -plibjibx-java lib/jibx-bind.jar usr/share/java/jibx-bind-$(DEB_UPSTREAM_VERSION).jar
-	dh_install -plibjibx-java lib/jibx-extras.jar usr/share/java/jibx-extras-$(DEB_UPSTREAM_VERSION).jar
-	dh_install -plibjibx-java lib/jibx-run.jar usr/share/java/jibx-run-$(DEB_UPSTREAM_VERSION).jar
-	dh_install -plibjibx-java lib/jibx-schema.jar usr/share/java/jibx-schema-$(DEB_UPSTREAM_VERSION).jar
+	dh_install -plibjibx-java lib/jibx-bind-$(DEB_UPSTREAM_VERSION).jar usr/share/java
+	dh_install -plibjibx-java lib/jibx-extras-$(DEB_UPSTREAM_VERSION).jar usr/share/java
+	dh_install -plibjibx-java lib/jibx-run-$(DEB_UPSTREAM_VERSION).jar usr/share/java
+	dh_install -plibjibx-java lib/jibx-schema-$(DEB_UPSTREAM_VERSION).jar usr/share/java
 	dh_link -plibjibx-java usr/share/java/jibx-bind-$(DEB_UPSTREAM_VERSION).jar usr/share/java/jibx-bind.jar
 	dh_link -plibjibx-java usr/share/java/jibx-extras-$(DEB_UPSTREAM_VERSION).jar usr/share/java/jibx-extras.jar
 	dh_link -plibjibx-java usr/share/java/jibx-run-$(DEB_UPSTREAM_VERSION).jar usr/share/java/jibx-run.jar
-	dh_link -plibjibx-java usr/share/java/jibx-schema-$(DEB_UPSTREAM_VERSION).jar usr/share/java/jibx-extras.jar
+	dh_link -plibjibx-java usr/share/java/jibx-schema-$(DEB_UPSTREAM_VERSION).jar usr/share/java/jibx-schema.jar