X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=debian%2Frules;h=00c75c3a6045f012690b682546b9003a1372a77e;hb=5e217877d0d85c56c881da5c8a11fd253c11fe0a;hp=6ff8c3bea0c4a19892821d9b198bdebe349d40d1;hpb=186ea161e7d144dd8e3791f174a7173e2f399346;p=userv-utils.git

diff --git a/debian/rules b/debian/rules
index 6ff8c3b..00c75c3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,7 @@
 # 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
@@ -65,13 +65,13 @@ override_dh_auto_install:
 		mv service.c.txt ipif.txt
 	cp -al debian/userv-ipif/. debian/userv-utils/.
 	-
-	set -e; cd debian/userv-www-cgi/usr/share/doc;	\
-		mv userv-cgi userv-utils;		\
+	set -e; cd debian/userv-ucgi/usr/share/doc;	\
+		mv userv-ucgi userv-utils;		\
 		cd userv-utils;				\
 		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
+	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
 	-
 	mv debian/userv-groupmanage/usr/share/doc/groupmanage \
 	   debian/userv-groupmanage/usr/share/doc/userv-groupmanage