[libjaxen-java] 24/49: Build fixes.

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository libjaxen-java.

commit 008fb1db5cceca68e72c0482e7539f91b9349c3c
Author: Marcus Better <marcus at better.se>
Date:   Wed Jun 6 15:57:20 2007 +0000

    Build fixes.
---
 build.xml             | 5 +++--
 debian/ant.properties | 1 +
 debian/rules          | 3 ++-
 debian/svn-deblayout  | 2 --
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/build.xml b/build.xml
index 8850a6a..d10cbac 100644
--- a/build.xml
+++ b/build.xml
@@ -24,8 +24,9 @@
   </property>
   <path id="build.classpath">
     <fileset dir="${libdir}">
-      <include name="**/*.jar">
-      </include>
+      <include name="jdom1.jar"/>
+      <include name="dom4j.jar"/>
+      <include name="xercesImpl.jar"/>
     </fileset>
   </path>
   <target name="init" description="o Initializes some properties">
diff --git a/debian/ant.properties b/debian/ant.properties
index f425dac..062091d 100644
--- a/debian/ant.properties
+++ b/debian/ant.properties
@@ -1 +1,2 @@
 noget=true
+libdir=/usr/share/java
diff --git a/debian/rules b/debian/rules
index 9215ab4..c6b8750 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,11 +4,12 @@ JAVA_HOME	:= /usr/lib/jvm/java-gcj
 DEB_JARS_BASE	:= /usr/share/java
 JAVACMD  	:= $(JAVA_HOME)/bin/java
 
-DEB_JARS  := ant ant-launcher jdom1 dom4j ant-junit junit xercesImpl
+DEB_JARS  := ant ant-launcher ant-junit junit
 
 DEB_CLASSPATH = $(shell for jar in $(DEB_JARS); do \
 		  echo -n "$(DEB_JARS_BASE)/$${jar}.jar:"; \
 		done; \
+		if [ -f "$(JAVA_HOME)/lib/tools.jar" ]; then echo -n "$(JAVA_HOME)/lib/tools.jar"; fi)
 
 DEB_ANT_ARGS	:= -propertyfile debian/ant.properties
 ANT_INVOKE	:= $(JAVACMD) -classpath $(DEB_CLASSPATH) \
diff --git a/debian/svn-deblayout b/debian/svn-deblayout
deleted file mode 100644
index 3dc8c9c..0000000
--- a/debian/svn-deblayout
+++ /dev/null
@@ -1,2 +0,0 @@
-buildArea=../../build-area
-origDir=..

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libjaxen-java.git