X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/71b70599a2cd81c13cc4326499a5d0c45358cd7d..4363757e38e4625de8a49cc3cbd8f04aa51a4167:/debian/rules

diff --git a/debian/rules b/debian/rules
index 9eb4d19..44219c5 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
@@ -104,6 +104,8 @@ pkg-disorder: build
 	$(INSTALL_DATA) CHANGES README debian/README.Debian \
 		BUGS README.* \
 		debian/disorder/usr/share/doc/disorder/.
+	rm -f debian/disorder/usr/share/doc/disorder/README.mac
+	rm -f debian/disorder/usr/share/doc/disorder/README.freebsd
 	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 \
@@ -150,22 +152,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