X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/eb5f83f45eb2ff415ededbb30187fec8c3e71010..6cab9448c8e116006285e71490d71cd158b04ca1:/debian/rules

diff --git a/debian/rules b/debian/rules
index ce385d7..424f506 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,6 +45,10 @@ export INSTALL_DATA
 export INSTALL_SCRIPT
 export INSTALL_PROGRAM
 
+# We override sendmail to the value defined in policy, in case configure picks
+# up some other sendmail.
+SENDMAIL=/usr/sbin/sendmail
+
 LIBTOOL=./libtool
 FAKEROOT=fakeroot
 
@@ -62,7 +66,7 @@ build:
 	  echo ./config.status;\
 	  ./config.status;\
 	fi
-	$(MAKE)
+	$(MAKE) SENDMAIL=${SENDMAIL}
 
 pkg-disorder: build
 	rm -rf debian/disorder
@@ -88,19 +92,22 @@ pkg-disorder: build
 		debian/disorder/etc/bash_completion.d/disorder
 	rm -rf debian/disorder/usr/share/man/man8
 	rm -rf debian/disorder/usr/share/disorder/*.html
+	rm -rf debian/disorder/usr/share/disorder/*.tmpl
 	rmdir debian/disorder/usr/share/disorder
 	rm -f debian/disorder/usr/bin/disorder-playrtp
 	rm -f debian/disorder/usr/bin/disobedience
 	rm -f debian/disorder/usr/share/man/man1/disorder-playrtp.1
 	rm -f debian/disorder/usr/share/man/man1/disobedience.1
+	rm -f debian/disorder/usr/share/man/man5/disorder_templates.5
+	rm -f debian/disorder/usr/share/man/man5/disorder_actions.5
+	rm -f debian/disorder/usr/share/man/man5/disorder_options.5
 	$(MKDIR) debian/disorder/etc/disorder
 	dpkg-shlibdeps -Tdebian/substvars.disorder \
 		debian/disorder/usr/bin/*
-	$(INSTALL_DATA) CHANGES README debian/README.Debian \
+	$(INSTALL_DATA) CHANGES.html README debian/README.Debian \
 		BUGS README.* \
 		debian/disorder/usr/share/doc/disorder/.
-	gzip -9f debian/disorder/usr/share/doc/disorder/CHANGES \
-		 debian/disorder/usr/share/doc/disorder/README \
+	gzip -9f debian/disorder/usr/share/doc/disorder/README \
 		 debian/disorder/usr/share/doc/disorder/README.* \
 		 debian/disorder/usr/share/doc/disorder/BUGS \
 		 debian/disorder/usr/share/man/man*/*
@@ -134,7 +141,8 @@ pkg-disorder-server: build
 	$(MAKE) DESTDIR=`pwd`/debian/disorder-server staticdir=/var/www/disorder installdirs install -C doc
 	rm -rf debian/disorder-server/usr/share/man/man1
 	rm -rf debian/disorder-server/usr/share/man/man3
-	rm -rf debian/disorder-server/usr/share/man/man5
+	rm -f debian/disorder-server/usr/share/man/man5/disorder_config.5
+	rm -f debian/disorder-server/usr/share/man/man5/disorder_protocol.5
 	$(MKDIR) debian/disorder-server/etc/disorder
 	$(MKDIR) debian/disorder-server/etc/init.d
 	$(MKDIR) debian/disorder-server/usr/lib/cgi-bin
@@ -147,7 +155,7 @@ pkg-disorder-server: build
 		debian/disorder-server/etc/disorder/options
 	$(INSTALL_DATA) debian/etc.disorder.options.user \
 		debian/disorder-server/etc/disorder/options.user
-	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) server/disorder.cgi \
+	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) cgi/disorder.cgi \
 		$(shell pwd)/debian/disorder-server/usr/lib/cgi-bin/disorder
 	dpkg-shlibdeps -Tdebian/substvars.disorder-server \
 		debian/disorder-server/usr/lib/cgi-bin/disorder \
@@ -186,9 +194,8 @@ pkg-disorder-playrtp: build
 		debian/disorder-playrtp/usr/bin/*
 	$(INSTALL_DATA) debian/README.RTP \
 		debian/disorder-playrtp/usr/share/doc/disorder-playrtp/README
-	$(INSTALL_DATA) CHANGES debian/disorder-playrtp/usr/share/doc/disorder-playrtp/CHANGES
-	gzip -9f debian/disorder-playrtp/usr/share/doc/disorder-playrtp/CHANGES \
-		 debian/disorder-playrtp/usr/share/man/man*/*
+	$(INSTALL_DATA) CHANGES.html debian/disorder-playrtp/usr/share/doc/disorder-playrtp/CHANGES.html
+	gzip -9f debian/disorder-playrtp/usr/share/man/man*/*
 	dpkg-gencontrol -isp -pdisorder-playrtp -Pdebian/disorder-playrtp -Tdebian/substvars.disorder-playrtp
 	chown -R root:root debian/disorder-playrtp
 	chmod -R g-ws debian/disorder-playrtp