X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;ds=sidebyside;f=debian%2Frules;h=b8b47aa6e777af52ffb37a967d8305d29f899176;hb=af0fdc2725972c0723e14ffe34a5dfae5c0b3594;hp=76e59ffcedbf230a000f2bba81c0f1d0edfb30f7;hpb=03a866952f4f2f7c26d0d54305d7ef739f5d9b2d;p=userv-utils.git

diff --git a/debian/rules b/debian/rules
index 76e59ff..b8b47aa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,13 +19,15 @@
 # You should have received a copy of the GNU General Public License
 # along with userv-utils; if not, see http://www.gnu.org/licenses/.
 
-subdirs_build=	ipif www-cgi git-daemon
+subdirs_build=	ipif ucgi git-daemon
 subdirs_nobuild=dyndns groupmanage misc
 package=	userv-utils
 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,16 +61,22 @@ override_dh_auto_install:
 	-
 	mv debian/userv-misc debian/userv-utils
 	-
-	set -e; cd debian/userv-ipif/usr/share/doc;	\
-		mv userv-ipif userv-utils;		\
-		cd userv-utils;				\
-		mv service.c.txt ipif.txt
+	mv $d/userv-ipif/usr/share/doc/userv-ipif/{service.c.txt,ipif.txt}
+	-
+	set -e; cd debian/userv-ucgi/usr/share/doc/userv-ucgi;	\
+		rename 's/^/ucgi-/' *
 	-
-	cp -al debian/userv-ipif/. debian/userv-utils/.
+	set -e; cd debian/userv-groupmanage/usr/share/doc;	\
+		mv groupmanage userv-groupmanage
+	-
+	set -e; for p in userv-ipif userv-ucgi; do		\
+		(cd debian/$$p/usr/share/doc;			\
+		 mv $$p userv-utils);				\
+		cp -al debian/$$p/. debian/userv-utils/.;	\
+	done
 	-
-	mv debian/userv-www-cgi debian/userv-cgi
-	mv debian/userv-groupmanage/usr/share/doc/groupmanage \
-	   debian/userv-groupmanage/usr/share/doc/userv-groupmanage
+	perl -pe 's{/usr/local/}{/usr/}' ucgi/www-cgi	\
+		>debian/userv-utils/etc/userv/services.d/www-cgi
 	-
 	rename 's/\.example$$//' $d/userv-ipif/etc/userv/vpn/*.example \
 		$d/userv-dyndns/etc/userv/dyndns-service-users.example \