X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/48deaa730813595a2482973c73efba4a6970a6d6..91370169de7f552f3a54e5ef9e079a202a5efbfa:/debian/rules

diff --git a/debian/rules b/debian/rules
index ac22a29..551014d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #! /usr/bin/make -f
 #
-# Copyright (C) 2004, 2005, 2006, 2007 Richard Kettlewell
+# Copyright (C) 2004-2008 Richard Kettlewell
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
 #
 
 # Options to configure.  This can be overridden by the caller if necessary.
-CONFIGURE=--prefix=/usr --sysconfdir=/etc --localstatedir=/var/lib --mandir=/usr/share/man
+CONFIGURE=--prefix=/usr --sysconfdir=/etc --localstatedir=/var/lib --mandir=/usr/share/man --with-browser=x-www-browser
 
 # Set DEB_BUILD_OPTIONS=noopt to produce a non-optimized build.
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -53,9 +53,10 @@ FAKEROOT=fakeroot
 # run if building from a checkout rather than a tarball.
 build:
 	@if test ! -f configure; then \
-	  echo ./prepare ${CONFIGURE} ${CONFIGURE_EXTRA};\
-	  ./prepare ${CONFIGURE} ${CONFIGURE_EXTRA};\
-	elif test ! -f config.status; then \
+	  echo ./prepare;\
+	  ./prepare;\
+	fi
+	@if test ! -f config.status; then \
 	  echo ./configure ${CONFIGURE} ${CONFIGURE_EXTRA};\
 	  ./configure ${CONFIGURE} ${CONFIGURE_EXTRA};\
 	else\
@@ -74,6 +75,7 @@ pkg-disorder: build
 	$(MKDIR) debian/disorder
 	$(MKDIR) debian/disorder/DEBIAN
 	$(MKDIR) debian/disorder/usr/share/doc/disorder
+	$(MKDIR) debian/disorder/etc/bash_completion.d
 	$(INSTALL_DATA) debian/copyright \
 		debian/disorder/usr/share/doc/disorder/copyright
 	$(INSTALL_DATA) debian/changelog \
@@ -88,9 +90,11 @@ pkg-disorder: build
 	$(MAKE) DESTDIR=`pwd`/debian/disorder installdirs install -C doc
 	$(MAKE) DESTDIR=`pwd`/debian/disorder installdirs install -C clients
 	$(MAKE) DESTDIR=`pwd`/debian/disorder installdirs install -C lib
-	$(MAKE) DESTDIR=`pwd`/debian/disorder installdirs install -C scripts
+	$(INSTALL_DATA) scripts/completion.bash \
+		debian/disorder/etc/bash_completion.d/disorder
 	rm -rf debian/disorder/usr/share/man/man8
 	rm -rf debian/disorder/usr/share/disorder/*.html
+	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
@@ -101,9 +105,9 @@ pkg-disorder: build
 	$(INSTALL_DATA) CHANGES README debian/README.Debian \
 		BUGS README.* \
 		debian/disorder/usr/share/doc/disorder/.
-	bzr log > debian/disorder/usr/share/doc/disorder/changelog
-	gzip -9f debian/disorder/usr/share/doc/disorder/changelog \
-		 debian/disorder/usr/share/doc/disorder/CHANGES \
+	rm -f debian/disorder/usr/share/doc/disorder/README.mac
+	rm -f debian/disorder/usr/share/doc/disorder/README.freebsd
+	gzip -9f debian/disorder/usr/share/doc/disorder/CHANGES \
 		 debian/disorder/usr/share/doc/disorder/README \
 		 debian/disorder/usr/share/doc/disorder/README.* \
 		 debian/disorder/usr/share/doc/disorder/BUGS \
@@ -147,22 +151,22 @@ pkg-disorder-server: build
 	rm -rf debian/disorder-server/usr/share/man/man5
 	$(MKDIR) debian/disorder-server/etc/disorder
 	$(MKDIR) debian/disorder-server/etc/init.d
-	$(MKDIR) debian/disorder-server/usr/lib/cgi-bin/disorder
+	$(MKDIR) debian/disorder-server/usr/lib/cgi-bin
 	$(MKDIR) debian/disorder-server/var/lib/disorder
 	$(INSTALL_SCRIPT) examples/disorder.init \
 		debian/disorder-server/etc/init.d/disorder
 	$(INSTALL_DATA) debian/etc.disorder.config \
 		debian/disorder-server/etc/disorder/config
-	$(INSTALL_DATA) debian/etc.disorder.options \
+	$(INSTALL_DATA) templates/options \
 		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 \
-		$(shell pwd)/debian/disorder-server/usr/lib/cgi-bin/disorder/disorder
+		$(shell pwd)/debian/disorder-server/usr/lib/cgi-bin/disorder
 	dpkg-shlibdeps -Tdebian/substvars.disorder-server \
-		debian/disorder-server/usr/lib/cgi-bin/disorder/* \
+		debian/disorder-server/usr/lib/cgi-bin/disorder \
 		debian/disorder-server/usr/sbin/* \
 		debian/disorder-server/usr/lib/disorder/*.so*
-	$(INSTALL_DATA) debian/htaccess \
-		debian/disorder-server/usr/lib/cgi-bin/disorder/.htaccess
 	rm -rf debian/disorder-server/usr/share/doc/disorder-server
 	ln -s disorder debian/disorder-server/usr/share/doc/disorder-server
 	dpkg-gencontrol -isp -pdisorder-server -Pdebian/disorder-server -Tdebian/substvars.disorder-server