X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/410801ac8f9ba8eb9b2aba42140892d1e1f4f745..bdd2a99650780a1ef4a9e788eaabbc5e810cc39c:/debian/rules

diff --git a/debian/rules b/debian/rules
index e030330..0c14444 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,8 +18,12 @@
 # USA
 #
 
+cgiexecdir=/usr/lib/cgi-bin
+httpdir=/var/www
+browser=x-www-browser
+
 # Options to configure.  This can be overridden by the caller if necessary.
-CONFIGURE=--prefix=/usr --sysconfdir=/etc --localstatedir=/var/lib --mandir=/usr/share/man --with-browser=x-www-browser
+CONFIGURE=--prefix=/usr --sysconfdir=/etc --localstatedir=/var/lib --mandir=/usr/share/man --with-browser=${browser} cgiexecdir="${cgiexecdir}" httpdir="${httpdir}"
 
 # Set DEB_BUILD_OPTIONS=noopt to produce a non-optimized build.
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -132,20 +136,20 @@ pkg-disorder-server: build
 	    $(INSTALL_SCRIPT) debian/$$f.disorder-server debian/disorder-server/DEBIAN/$$f; \
 	  fi;\
 	done
-	$(MAKE) DESTDIR=`pwd`/debian/disorder-server staticdir=/var/www/disorder installdirs install -C images
-	$(MAKE) DESTDIR=`pwd`/debian/disorder-server staticdir=/var/www/disorder installdirs install -C server
-	$(MAKE) DESTDIR=`pwd`/debian/disorder-server staticdir=/var/www/disorder installdirs install -C templates
-	$(MAKE) DESTDIR=`pwd`/debian/disorder-server staticdir=/var/www/disorder installdirs install -C driver
-	$(MAKE) DESTDIR=`pwd`/debian/disorder-server staticdir=/var/www/disorder installdirs install -C plugins
-	$(MAKE) DESTDIR=`pwd`/debian/disorder-server staticdir=/var/www/disorder installdirs install -C sounds
-	$(MAKE) DESTDIR=`pwd`/debian/disorder-server staticdir=/var/www/disorder installdirs install -C doc
+	$(MAKE) DESTDIR=`pwd`/debian/disorder-server installdirs install -C images
+	$(MAKE) DESTDIR=`pwd`/debian/disorder-server installdirs install -C server
+	$(MAKE) DESTDIR=`pwd`/debian/disorder-server installdirs install -C templates
+	$(MAKE) DESTDIR=`pwd`/debian/disorder-server installdirs install -C driver
+	$(MAKE) DESTDIR=`pwd`/debian/disorder-server installdirs install -C plugins
+	$(MAKE) DESTDIR=`pwd`/debian/disorder-server installdirs install -C sounds
+	$(MAKE) DESTDIR=`pwd`/debian/disorder-server installdirs install -C doc
 	rm -rf debian/disorder-server/usr/share/man/man1
 	rm -rf debian/disorder-server/usr/share/man/man3
 	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
+	$(MKDIR) debian/disorder-server${cgiexecdir}
 	$(MKDIR) debian/disorder-server/var/lib/disorder
 	$(INSTALL_SCRIPT) examples/disorder.init \
 		debian/disorder-server/etc/init.d/disorder
@@ -155,10 +159,10 @@ 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) cgi/disorder.cgi \
-		$(shell pwd)/debian/disorder-server/usr/lib/cgi-bin/disorder
+	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) cgi/disorder \
+		$(shell pwd)/debian/disorder-server${cgiexecdir}/disorder
 	dpkg-shlibdeps -Tdebian/substvars.disorder-server \
-		debian/disorder-server/usr/lib/cgi-bin/disorder \
+		debian/disorder-server${cgiexecdir}/disorder \
 		debian/disorder-server/usr/sbin/* \
 		debian/disorder-server/usr/lib/disorder/*.so*
 	rm -rf debian/disorder-server/usr/share/doc/disorder-server
@@ -194,9 +198,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