X-Git-Url: http://git.sven.stormbind.net/?p=sven%2Fjava-package.git;a=blobdiff_plain;f=debian%2Frules;h=7e1f875e8ec43ef665ae987d4272bbb049b49b75;hp=c6f6e22b6a5a1d1ca8c169c5f64de4001f21b5e4;hb=848a06f1b5db110b32fc4d42c63b9bc3abc79d1d;hpb=ca8b5d176518ea838461b92229d2fbebb3731de8

diff --git a/debian/rules b/debian/rules
index c6f6e22..7e1f875 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,11 +8,12 @@
 VERSION := $(shell head -n 1 $(CURDIR)/debian/changelog | sed 's/.*(//;s/).*//')
 B := $(CURDIR)/debian/java-package
 
-build: build-stamp 
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
 
 build-stamp:
 	dh_testdir
-	# Add here commands to compile the indep part of the package.
 	sed s/@VERSION@/$(VERSION)/ make-jpkg > make-jpkg.out
 	touch $@
 
@@ -27,12 +28,8 @@ install: build
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-
 	install -m 755 make-jpkg.out $(B)/usr/bin/make-jpkg
-	cp lib/*.sh lib/*-common $(B)/usr/share/java-package/
-	for dir in $(wildcard oracle-j2*); do \
-		cp -a $$dir $(B)/usr/share/java-package/; \
-	done
+	cp lib/*.sh $(B)/usr/share/java-package/
 	find $(B) -type d -name .svn | xargs -r rm -r
 
 # Generate SUPPORTED