X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/ae13d68e32564cd0f0dbf46c820bf001fccb31d1..cdaf98f0290a30469af909b669312b1033cf30df:/debian/rules

diff --git a/debian/rules b/debian/rules
index 20c38ca..000be81 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,8 +18,12 @@
 # USA
 #
 
+cgidir=/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 cgidir="${cgidir}" httpdir="${httpdir}"
 
 # Set DEB_BUILD_OPTIONS=noopt to produce a non-optimized build.
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -45,6 +49,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 +70,7 @@ build:
 	  echo ./config.status;\
 	  ./config.status;\
 	fi
-	$(MAKE)
+	$(MAKE) SENDMAIL=${SENDMAIL}
 
 pkg-disorder: build
 	rm -rf debian/disorder
@@ -100,11 +108,10 @@ pkg-disorder: build
 	$(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*/*
@@ -129,13 +136,13 @@ 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
@@ -152,7 +159,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 \
 		$(shell pwd)/debian/disorder-server/usr/lib/cgi-bin/disorder
 	dpkg-shlibdeps -Tdebian/substvars.disorder-server \
 		debian/disorder-server/usr/lib/cgi-bin/disorder \
@@ -191,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