X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=debian%2Frules;h=2948e85a259dc981df67fe776521b798fd1d1540;hb=66bcaab36b4177384774d97ed01aed9e2822f10c;hp=c251a11b7dc1c7d6d0602ab7fe8ac33745e43570;hpb=cfdb8ffcdaa745a6742a6586508ff9ef9474fc98;p=mirror%2Fuserdir-ldap.git

diff --git a/debian/rules b/debian/rules
index c251a11..2948e85 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,12 +20,12 @@ clean:
 
 instdirs = \
 	usr/bin \
-	usr/man/man1 \
+	usr/share/man/man1 \
 	$(pysite)/userdir_ldap \
 	var/www/userdir-ldap \
 	var/cache/userdir-ldap/web-cookies \
 	var/cache/userdir-ldap/hosts \
-	usr/doc/$(package)/samples \
+	usr/share/doc/$(package)/samples \
 	etc/userdir-ldap/templates
 
 binary-indep: build
@@ -38,16 +38,20 @@ binary-indep: build
 	echo "userdir_gpg" >> $(i)/$(pysite)/userdir_ldap.pth
 	install -m 644 userdir_ldap.py userdir_gpg.py \
 		$(i)/$(pysite)/userdir_ldap/
-	install -m 755 {ud-forwardlist,ud-gpgimport,ud-info,ud-ldapshow,ud-userimport,ud-mailgate,ud-generate,ud-passchk,ud-useradd,ud-replicate,ud-xearth} $(i)/usr/bin/
-	install -m 755 web/*.* $(i)/var/www/userdir-ldap/
+	install -m 755 {ud-forwardlist,ud-gpgimport,ud-info,ud-ldapshow,ud-userimport,ud-mailgate,ud-generate,ud-passchk,ud-useradd,ud-replicate,ud-xearth,ud-fingerserv,ud-echelon,ud-groupadd,ud-host} $(i)/usr/bin/
+	install -m 644 web/*.tab $(i)/var/www/userdir-ldap/
+	install -m 644 web/*.html $(i)/var/www/userdir-ldap/
+	install -m 644 web/*.cfg $(i)/var/www/userdir-ldap/
+	install -m 644 web/*.pm $(i)/var/www/userdir-ldap/
+	install -m 755 web/*.cgi $(i)/var/www/userdir-ldap/
 	chown www-data.www-data $(i)/var/cache/userdir-ldap/web-cookies/
 	chmod u=rwx,g=,o= $(i)/var/cache/userdir-ldap/web-cookies/
 	
-	install -m 644 doc/{apache-config.txt,slapd-config.txt} $(i)/usr/doc/$(package)
-	install -m 644 doc/samples/ud-* $(i)/usr/doc/$(package)/samples
-	gzip -9 $(i)/usr/doc/$(package)/*.txt
+	install -m 644 doc/{apache-config.txt,slapd-config.txt} $(i)/usr/share/doc/$(package)
+	install -m 644 doc/samples/ud-* $(i)/usr/share/doc/$(package)/samples
+	gzip -9 $(i)/usr/share/doc/$(package)/*.txt
 	install -m 644 userdir-ldap.conf $(i)/etc/userdir-ldap/
-	echo "# See /usr/doc/userdir-ldap" > $(i)/etc/userdir-ldap/generate.conf
+	echo "# See /usr/share/doc/userdir-ldap" > $(i)/etc/userdir-ldap/generate.conf
 	chmod 644 $(i)/etc/userdir-ldap/generate.conf
 	install -m 644 templates/*-* $(i)/etc/userdir-ldap/templates/