first pass at splitting rules targets .. still folds through one 'install'

1 files changed, 42 insertions, 31 deletions

diff --git a/debian/rules b/debian/rules
index 028b548f..1f7548dd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,12 +22,16 @@ configure-stamp:
 	touch configure-stamp
 
 build: build-arch build-indep
-build-arch: build-stamp
-build-indep: build-stamp
 
-build-stamp: configure-stamp  
+build-arch: build-arch-stamp
+build-arch-stamp: configure-stamp
 	dh_testdir
 	$(MAKE) VERSION=$(PKG_VERSION)
+	touch $@
+
+build-indep: build-indep-stamp
+build-indep-stamp: configure-stamp  
+	dh_testdir
 	(cd doc ; $(MAKE))
 	touch $@
 
@@ -42,46 +46,53 @@ install: build
 	dh_testdir
 	dh_testroot
 	dh_prep  
-	dh_installdirs
+	dh_installdirs -a
 
 	$(MAKE) DESTDIR=$(CURDIR)/debian/altos install
 	sed -i "/dependency_libs/ s/'.*'/''/" `find debian/altos/usr/lib/altos/ -name '*.la'`
 
 binary-indep: install
-
-binary-arch: install
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs ChangeLog
-	dh_installdocs
-	dh_installexamples
-	dh_install
+	dh_installdocs -i
+	dh_installexamples -i
+	dh_install -i
 	ln -s /usr/share/altos/themes/background.png \
 		debian/altos/usr/share/gdm/themes/altusmetrum/background.png
 	ln -s /usr/share/altos/themes/background.png \
 		debian/altos/usr/share/slim/themes/altusmetrum/background.png
-	dh_installmenu
-#	dh_installdebconf
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_python
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-#	dh_perl
-#	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+	dh_installmenu -i
+	dh_installman -i
+	dh_link -i
+	dh_strip -i
+	dh_compress -i
+	dh_fixperms -i
+	dh_installdeb -i
+	dh_shlibdeps -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
+
+
+binary-arch: install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs ChangeLog
+	dh_installdocs -a
+	dh_installexamples -a
+	dh_install -a
+	dh_installmenu -a
+	dh_installman -a
+	dh_link -a
+	dh_strip -a
+	dh_compress -a
+	dh_fixperms -a
+	dh_installdeb -a
+	dh_shlibdeps -a
+	dh_gencontrol -a
+	dh_md5sums -a
+	dh_builddeb -a
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install configure