X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/7a4c02b06ea54d59bb3b724119542726da830ddd..3c03f5572c03f41c268ec045bbd4a4d39afb80b1:/debian/rules

diff --git a/debian/rules b/debian/rules
index 53dc486..6c5b0ac 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,15 +48,14 @@ export INSTALL_PROGRAM
 LIBTOOL=./libtool
 FAKEROOT=fakeroot
 
-.PHONY: build
 # ./prepare is the script that generates configure etc.  It only needs to be
 # run if building from a checkout rather than a tarball.
 build:
-	@if test ! -f configure; then \
+	@set -e;if test ! -f configure; then \
 	  echo ./prepare;\
 	  ./prepare;\
 	fi
-	@if test ! -f config.status; then \
+	@set -e;if test ! -f config.status; then \
 	  echo ./configure ${CONFIGURE} ${CONFIGURE_EXTRA};\
 	  ./configure ${CONFIGURE} ${CONFIGURE_EXTRA};\
 	else\
@@ -65,11 +64,6 @@ build:
 	fi
 	$(MAKE)
 
-.PHONY: cleanpkg-disorder
-cleanpkg-disorder:
-	rm -rf debian/disorder
-
-.PHONY: pkg-disorder
 pkg-disorder: build
 	rm -rf debian/disorder
 	$(MKDIR) debian/disorder
@@ -94,11 +88,15 @@ 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/*
@@ -115,12 +113,6 @@ pkg-disorder: build
 	chmod -R g-ws debian/disorder
 	dpkg --build debian/disorder ..
 
-
-.PHONY: cleanpkg-disorder-server
-cleanpkg-disorder-server:
-	rm -rf debian/disorder-server
-
-.PHONY: pkg-disorder-server
 pkg-disorder-server: build
 	rm -rf debian/disorder-server
 	$(MKDIR) debian/disorder-server
@@ -146,7 +138,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
@@ -159,7 +152,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 \
@@ -172,12 +165,6 @@ pkg-disorder-server: build
 	chmod -R g-ws debian/disorder-server
 	dpkg --build debian/disorder-server ..
 
-
-.PHONY: cleanpkg-disorder-playrtp
-cleanpkg-disorder-playrtp:
-	rm -rf debian/disorder-playrtp
-
-.PHONY: pkg-disorder-playrtp
 pkg-disorder-playrtp: build
 	rm -rf debian/disorder-playrtp
 	$(MKDIR) debian/disorder-playrtp
@@ -212,12 +199,6 @@ pkg-disorder-playrtp: build
 	chmod -R g-ws debian/disorder-playrtp
 	dpkg --build debian/disorder-playrtp ..
 
-
-.PHONY: cleanpkg-disobedience
-cleanpkg-disobedience:
-	rm -rf debian/disobedience
-
-.PHONY: pkg-disobedience
 pkg-disobedience: build
 	rm -rf debian/disobedience
 	$(MKDIR) debian/disobedience
@@ -255,7 +236,6 @@ pkg-disobedience: build
 	chmod -R g-ws debian/disobedience
 	dpkg --build debian/disobedience ..
 
-
 DEBVERSION:=$(shell dpkg-parsechangelog|awk '/Version:/ {print $$2}')
 DSC=disorder_$(DEBVERSION).dsc
 DEBSRC=disorder_$(DEBVERSION).tar.gz
@@ -273,16 +253,20 @@ source-check: source
 	dpkg-source -x $(DSC)
 	cd disorder-$(DEBVERSION) && dpkg-buildpackage -r$(FAKEROOT)
 
-.PHONY: source source-check
-
-.PHONY: binary binary-arch binary-indep
 binary: binary-arch binary-indep
-binary-arch:  pkg-disorder pkg-disorder-server pkg-disorder-playrtp pkg-disobedience
+binary-arch: pkg-disorder pkg-disorder-server pkg-disorder-playrtp \
+	     pkg-disobedience
 binary-indep: 
 
-.PHONY: clean
-clean:  cleanpkg-disorder cleanpkg-disorder-server cleanpkg-disorder-playrtp cleanpkg-disobedience
+clean:
 	-$(MAKE) distclean
 	rm -f config.cache
 	rm -f debian/files
 	rm -f debian/substvars.*
+	rm -rf debian/disorder
+	rm -rf debian/disorder-server
+	rm -rf debian/disorder-playrtp
+	rm -rf debian/disobedience
+
+.PHONY: clean build pkg-disorder pkg-disorder-server pkg-disorder-playrtp \
+	pkg-disobedience source source-check binary binary-arch binary-indep