From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 15 Apr 2017 11:11:10 +0000 (+0100)
Subject: debian/: Prep for rules refactoring (nfc)
X-Git-Url: https://git.distorted.org.uk/~mdw/userv-utils/commitdiff_plain/817505e0eb75333c622f1a6df5d217bd6bb347da

debian/: Prep for rules refactoring (nfc)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/debian/rules b/debian/rules
index 00c75c3..e0cdc45 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,6 +26,8 @@ packages_indep=	userv-dyndns userv-groupmanage userv-utils userv-git-daemon
 packages_arch=	userv-ipif userv-cgi
 packages=	$(packages_indep) $(packages_arch)
 
+SHELL=/bin/bash
+
 cwd=	$(shell pwd)
 d=	$(cwd)/debian
 
@@ -59,17 +61,20 @@ override_dh_auto_install:
 	-
 	mv debian/userv-misc debian/userv-utils
 	-
+	mv $d/userv-ipif/usr/share/doc/userv-ipif/{service.c.txt,ipif.txt}
+	-
+	rename 's/^/ucgi-/' debian/userv-www-cgi/usr/share/doc/*
+	-
 	set -e; cd debian/userv-ipif/usr/share/doc;	\
 		mv userv-ipif userv-utils;		\
-		cd userv-utils;				\
-		mv service.c.txt ipif.txt
+		cd userv-utils
 	cp -al debian/userv-ipif/. debian/userv-utils/.
 	-
 	set -e; cd debian/userv-ucgi/usr/share/doc;	\
 		mv userv-ucgi userv-utils;		\
-		cd userv-utils;				\
-		rename 's/^/ucgi-/' *
+		cd userv-utils
 	cp -al debian/userv-ucgi/. debian/userv-utils/.
+	-
 	perl -pe 's{/usr/local/}{/usr/}' ucgi/www-cgi	\
 		>debian/userv-utils/etc/userv/services.d/www-cgi
 	-