X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;ds=sidebyside;f=debian%2Frules;h=62d84cfccfdc115b37bdda682985667e2c980c76;hb=81949a0c60d9721ea9a1536d71854a31368b7d97;hp=7ac91e218d491536c56eb651c445001d5c09e5bc;hpb=76415873c03f50b8d952db149fe5b6b7eda09a05;p=chiark-utils.git

diff --git a/debian/rules b/debian/rules
index 7ac91e2..62d84cf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
 
 SHELL=/bin/bash
 
-subdirs_build=	cprogs
+subdirs_build_arch=	cprogs
 subdirs_nobuild=backup sync-accounts scripts
 package=	chiark-utils
 packages_indep=	chiark-backup chiark-scripts
@@ -15,23 +15,27 @@ t=	$d/tmp
 
 build:
 	$(checkdir)
-	set -e; for s in $(subdirs_build); do $(MAKE) -C $$s all; done
+	set -e; for s in $(subdirs_build_arch); do $(MAKE) -C $$s all; done
 	touch build
 
+build-indep: build
+build-arch: build
+
 clean:
 	$(checkdir)
 	rm -f build
-	set -e; for s in $(subdirs_build); do \
+	set -e; for s in $(subdirs_build_arch); do \
 		$(MAKE) -C $$s -i distclean || \
 		$(MAKE) -C $$s -f Makefile.in distclean; \
 	done
 	rm -rf *~ debian/tmp debian/*~ debian/files* debian/substvars*
+	rm -rf debian/sv-* debian/*.debhelper.log
 
 binary-prep:
 	$(checkdir)
 	rm -rf debian/tmp*
 	#
-	set -e; for s in $(subdirs_build) $(subdirs_nobuild); do \
+	set -e; for s in $(subdirs_build_arch) $(subdirs_nobuild); do \
 		$(MAKE) -C $$s install install-docs install-examples \
 			prefix=$t/$$s/usr \
 			etcdir=$t/$$s/etc \
@@ -98,6 +102,7 @@ binary-one:
 		cp debian/$p/$$f $t/$p/DEBIAN/$$f; \
 		chmod u=rwX,go=rX $t/$p/DEBIAN/$$f; \
 	done
+	dh_link -p$p -Pdebian/tmp/$p
 	dpkg-gencontrol -isp -p$p -P$t/$p -Tdebian/sv-$p
 	chown -R root.root debian/tmp
 	chmod -R g-ws debian/tmp
@@ -118,7 +123,7 @@ binary-arch:	checkroot build binary-prep
 		$t/chiark-really/usr/sbin/*
 	set -e; for f in $t/chiark-utils-bin/usr/bin/*; do \
 		case "$$f" in \
-		*/xacpi-simple)		d=Suggests	;; \
+		*/xbatmon-simple)	d=Suggests	;; \
 		*/watershed|*/summer)	d=Recommends	;; \
 		*)			d=Depends	;; \
 		esac; \