X-Git-Url: https://git.distorted.org.uk/~mdw/userv-utils/blobdiff_plain/186ea161e7d144dd8e3791f174a7173e2f399346..5e91d4da205f42c4811954bf1145d59efb95327b:/debian/rules

diff --git a/debian/rules b/debian/rules
index 6ff8c3b..b84847b 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,26 +61,27 @@ 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
-	cp -al debian/userv-ipif/. debian/userv-utils/.
+	mv $d/userv-ipif/usr/share/doc/userv-ipif/{service.c.txt,ipif.txt}
 	-
-	set -e; cd debian/userv-www-cgi/usr/share/doc;	\
-		mv userv-cgi userv-utils;		\
-		cd userv-utils;				\
+	set -e; cd debian/userv-ucgi/usr/share/doc/userv-ucgi;	\
 		rename 's/^/ucgi-/' *
-	cp -al debian/userv-www-cgi/. debian/userv-utils/.
-	cp www-cgi/www-cgi \
-		debian/userv-utils/etc/userv/services.d/ucgi
 	-
-	mv debian/userv-groupmanage/usr/share/doc/groupmanage \
-	   debian/userv-groupmanage/usr/share/doc/userv-groupmanage
+	set -e; cd debian/userv-groupmanage/usr/share/doc;	\
+		mv groupmanage userv-groupmanage;		\
+		rm userv-groupmanage/INSTALL
+	-
+	set -e; for p in userv-ipif userv-ucgi userv-groupmanage; do	\
+		(cd debian/$$p/usr/share/doc;			\
+		 mv $$p userv-utils);				\
+		cp -al debian/$$p/. debian/userv-utils/.;	\
+	done
+	-
+	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 \
-		$d/userv-groupmanage/etc/groupmanage.conf.example
+		$d/userv-utils/etc/groupmanage.conf.example
 	rename 's/\.distrib$$//' $d/*/etc/userv/services.d/*.distrib
 	-
 	mv $d/userv-utils/usr/bin/mailq $d/userv-utils/usr/bin/mailq.userv