[pkg-java] r3536 - trunk/aspectj/debian

[tgg at alioth.debian.org]

Author: tgg
Date: 2007-05-23 22:54:54 +0000 (Wed, 23 May 2007)
New Revision: 3536

Modified:
   trunk/aspectj/debian/rules
Log:
enable bcel compilation. Needs polishing


Modified: trunk/aspectj/debian/rules
===================================================================
--- trunk/aspectj/debian/rules	2007-05-23 22:30:47 UTC (rev 3535)
+++ trunk/aspectj/debian/rules	2007-05-23 22:54:54 UTC (rev 3536)
@@ -5,7 +5,7 @@
 include /usr/share/cdbs/1/class/ant.mk
 
 JAVA_HOME := /usr/lib/jvm/java-gcj
-DEB_BUILDDIR := modules/build
+DEB_BUILDDIR = modules/build
 
 MKDIR := mkdir -p
 LN_S := ln -sf
@@ -22,9 +22,6 @@
 
 AJ_BCEL_HOME := modules/lib/bcel
 
-# We need to compile the AspectJ modified bcel library
-$(AJ_BCEL_HOME)/bcel.jar: $(AJ_BCEL_HOME)/bcel-src.zip
-
 pre-build:: $(AJ_BCEL_HOME)/bcel.jar
 	# Setup symlinks: ant
 	mkdir -p $(AJ_ANT_HOME)/lib
@@ -63,6 +60,11 @@
 
 	rm -f $(DEB_BUILDDIR)/local.properties
 
+# We need to compile the AspectJ modified bcel library
+$(AJ_BCEL_HOME)/bcel.jar: DEB_BUILDDIR=$(AJ_BCEL_HOME)
+$(AJ_BCEL_HOME)/bcel.jar: $(AJ_BCEL_HOME)/bcel-src.zip
+	$(DEB_ANT_INVOKE) jar
+
 .PHONY: get-orig-source
 get-orig-source:
 	sh debian/cvs-get.sh