X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/1151ed913400df946e9698af547d3504b60e5c44..cc3ede61012fc9f409b7c7e6197d5c563d11d7da:/debian/rules

diff --git a/debian/rules b/debian/rules
index 865fb6e..86d835a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,24 +2,26 @@
 #
 # Copyright (C) 2004-2008 Richard Kettlewell
 #
-# This program is free software; you can redistribute it and/or modify
+# 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
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-# USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+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 cgidir=/usr/lib/cgi-bin
+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 +134,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
@@ -156,9 +158,9 @@ pkg-disorder-server: build
 	$(INSTALL_DATA) debian/etc.disorder.options.user \
 		debian/disorder-server/etc/disorder/options.user
 	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) cgi/disorder \
-		$(shell pwd)/debian/disorder-server/usr/lib/cgi-bin/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