8 files changed, 18 insertions, 16 deletions
diff --git a/debian/interimap.docs b/debian/interimap.docs
index 724f6e5..930b5da 100644
--- a/debian/interimap.docs
+++ b/debian/interimap.docs
@@ -1,4 +1,4 @@
-share/doc/interimap/README
-share/doc/interimap/getting-started.md
-share/doc/interimap/interimap.sample
-share/doc/interimap/multi-account.md
+usr/share/doc/interimap/README
+usr/share/doc/interimap/getting-started.md
+usr/share/doc/interimap/interimap.sample
+usr/share/doc/interimap/multi-account.md
diff --git a/debian/interimap.install b/debian/interimap.install
index dc47f19..7a8281a 100644
--- a/debian/interimap.install
+++ b/debian/interimap.install
@@ -1,3 +1,3 @@
-bin/interimap /usr/bin
-lib/systemd/user/interimap.service  usr/lib/systemd/user
-lib/systemd/user/interimap@.service usr/lib/systemd/user
+usr/bin/interimap /usr/bin
+usr/lib/systemd/user/interimap.service  usr/lib/systemd/user
+usr/lib/systemd/user/interimap@.service usr/lib/systemd/user
diff --git a/debian/interimap.manpages b/debian/interimap.manpages
index faa1e84..9216a64 100644
--- a/debian/interimap.manpages
+++ b/debian/interimap.manpages
@@ -1 +1 @@
-share/man/man1/interimap.1
+usr/share/man/man1/interimap.1
diff --git a/debian/libinterimap.install b/debian/libinterimap.install
index c446f51..514d1f8 100644
--- a/debian/libinterimap.install
+++ b/debian/libinterimap.install
@@ -1 +1 @@
-share/perl5/Net/IMAP/InterIMAP.pm /usr/share/perl5/Net/IMAP
+usr/share/perl5/Net/IMAP/InterIMAP.pm /usr/share/perl5/Net/IMAP
diff --git a/debian/pullimap.docs b/debian/pullimap.docs
index c368061..253ee67 100644
--- a/debian/pullimap.docs
+++ b/debian/pullimap.docs
@@ -1 +1 @@
-share/doc/pullimap/pullimap.sample
+usr/share/doc/pullimap/pullimap.sample
diff --git a/debian/pullimap.install b/debian/pullimap.install
index 88dbf02..aad8978 100644
--- a/debian/pullimap.install
+++ b/debian/pullimap.install
@@ -1,2 +1,2 @@
-bin/pullimap /usr/bin
-lib/systemd/user/pullimap@.service usr/lib/systemd/user
+usr/bin/pullimap /usr/bin
+usr/lib/systemd/user/pullimap@.service usr/lib/systemd/user
diff --git a/debian/pullimap.manpages b/debian/pullimap.manpages
index c620789..ec52e4d 100644
--- a/debian/pullimap.manpages
+++ b/debian/pullimap.manpages
@@ -1 +1 @@
-share/man/man1/pullimap.1
+usr/share/man/man1/pullimap.1
diff --git a/debian/rules b/debian/rules
index cdfdcaf..b4b5d0b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,13 @@
 #!/usr/bin/make -f
 
+MAKEFLAGS = prefix=/usr sitelib=/usr/share/perl5
+
 %:
 	dh $@
 
-override_dh_installsystemduser:
-	dh_installsystemduser --no-enable
-
 override_dh_auto_test:
 	# /dev/shm, the default, might be mounted with noexec
 	dh_auto_test -- TMPDIR=/var/tmp
+
+override_dh_installsystemduser:
+	dh_installsystemduser --no-enable