X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=blobdiff_plain;f=debian%2Frules;h=235a31d3d03d733fb178db534c3a98da4fc00f45;hp=8265a3d9211be22e3121703d7b8c60d48b498698;hb=f8ddd2789c8752cd919a9f9d5f1e05d615ceff1a;hpb=17fb3a3831ca812a3ad384f4eec3b977432facd9

diff --git a/debian/rules b/debian/rules
index 8265a3d..235a31d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,9 @@
 #!/usr/bin/make -f
 
-subdirs=	backup
+subdirs_build=	cprogs
+subdirs_nobuild=backup sync-accounts scripts
 package=	chiark-utils
-packages_indep=	chiark-backup
+packages_indep=	chiark-backup chiark-scripts
 packages_arch=	chiark-rwbuffer
 packages=	$(packages_indep) $(packages_arch)
 
@@ -12,13 +13,13 @@ t=	$d/tmp
 
 build:
 	$(checkdir)
-	set -e; for s in $(subdirs); do $(MAKE) -C $$s all; done
+	set -e; for s in $(subdirs_build); do $(MAKE) -C $$s all; done
 	touch build
 
 clean:
 	$(checkdir)
 	rm -f build
-	set -e; for s in $(subdirs); do \
+	set -e; for s in $(subdirs_build); do \
 		$(MAKE) -C $$s -i distclean || \
 		$(MAKE) -C $$s -f Makefile.in distclean; \
 	done
@@ -28,6 +29,19 @@ binary-prep:
 	$(checkdir)
 	rm -rf debian/tmp*
 	#
+	set -e; for s in $(subdirs_build) $(subdirs_nobuild); do \
+		$(MAKE) -C $$s install install-docs install-examples \
+			prefix=$t/$$s/usr \
+			etcdir=$t/$$s/etc \
+			varlib=$t/$$s/var/lib \
+			mandir=$t/$$s/usr/share/man; \
+	done
+	#
+	cp -a debian/tmp/sync-accounts/* debian/tmp/scripts/.
+	rm -r debian/tmp/sync-accounts
+	mv debian/tmp/scripts debian/tmp/chiark-scripts
+	mv debian/tmp/backup debian/tmp/chiark-backup
+	#
 	set -e; for p in $(packages); do \
 		install -d $t/$$p/DEBIAN $t/$$p/usr/share/doc/$$p; \
 		cp debian/copyright debian/changelog \
@@ -37,17 +51,18 @@ binary-prep:
 		gzip -9v $t/$$p/usr/share/doc/$$p/changelog; \
 		done
 	#
-	$(MAKE) -C backup install install-docs install-examples \
-		prefix=$t/chiark-backup/usr \
-		etcdir=$t/chiark-backup/etc \
-		varlib=$t/chiark-backup/var/lib
-	#
 	install -d $t/chiark-rwbuffer/usr/bin
-	cd $t/chiark-backup/usr/bin && \
+	install -d $t/chiark-rwbuffer/usr/share/man/man1
+	cd $t/cprogs/usr/bin && \
 		mv readbuffer writebuffer $t/chiark-rwbuffer/usr/bin
+	cd $t/cprogs/usr/share/man/man1 && \
+		mv readbuffer.1 writebuffer.1 $t/chiark-rwbuffer/usr/share/man/man1
+	gzip -9f $t/*/usr/share/man/man*/*
 
 binary-hook-chiark-backup:
 binary-hook-chiark-rwbuffer:
+binary-hook-sync-accounts:
+binary-hook-chiark-scripts:
 
 binary-one:
 	set -e; for f in preinst postinst prerm postrm conffiles; do \
@@ -72,7 +87,7 @@ binary-arch:	checkroot build binary-prep
 		do debian/rules binary-one p=$$p; done
 
 define checkdir
-	test -f backup/writebuffer.c
+	test -f cprogs/writebuffer.c
 endef
 
 # Below here is fairly generic really