svn commit: r634409 - /harmony/enhanced/trunk/debian/rules

[hi...@apache.org]

Author: hindessm
Date: Thu Mar  6 12:41:14 2008
New Revision: 634409

URL: http://svn.apache.org/viewvc?rev=634409&view=rev
Log:
Hack to make sure ecj.jar is available during the debian package build.
That is, set the ant library path at /usr/share/java rather than
/usr/share/ant/lib since the former appears to contain the ant jars and
other jars installed by debian packages.

Modified:
    harmony/enhanced/trunk/debian/rules

Modified: harmony/enhanced/trunk/debian/rules
URL: http://svn.apache.org/viewvc/harmony/enhanced/trunk/debian/rules?rev=634409&r1=634408&r2=634409&view=diff
==============================================================================
--- harmony/enhanced/trunk/debian/rules (original)
+++ harmony/enhanced/trunk/debian/rules Thu Mar  6 12:41:14 2008
@@ -10,7 +10,9 @@
 # Modified to make a template file for a multi-binary package with separated
 # build-arch and build-indep targets  by Bill Allombert 2001
 
-ANT_FLAGS = -Dhy.no.sig=true -Duse.libstdc++6=true -Dhy.local.zlib=true \
+# -lib /usr/share/java ensures that ant finds ecj.jar, etc
+ANT_FLAGS = -lib /usr/share/java \
+            -Dhy.no.sig=true -Duse.libstdc++6=true -Dhy.local.zlib=true \
             -Dhy.zip.api=false -Dhy.no.thr=false -Dauto.fetch=true
 JREDIR=$(CURDIR)/debian/harmony-5.0-jre
 JDKDIR=$(CURDIR)/debian/harmony-5.0-jdk
@@ -125,7 +127,7 @@
 #	dh_perl
 	dh_makeshlibs
 	dh_installdeb
-	dh_shlibdeps
+	LD_LIBRARY_PATH=$(JREDIR)/usr/lib/harmony-5.0/jdk/jre/bin/default:$LD_LIBRARY_PATH dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb