=== modified file 'Makefile'
--- Makefile	2008-09-06 16:31:49 +0000
+++ Makefile	2008-09-07 01:20:43 +0000
@@ -13,14 +13,19 @@
 #COVERAGE=--coverage
 OPTIMIZE=-Os
 LANGUAGE=-std=gnu99
-# PREFIX=/usr/local
+
+## Use these settings for a traditional /usr/local install
+# PREFIX=$(DESTDIR)/usr/local
+# CONFDIR=$(PREFIX)/lib/mandos
+# KEYDIR=$(PREFIX)/lib/mandos/keys
+# MANDIR=$(PREFIX)/man
+# INITRAMFSTOOLS=/etc/initramfs-tools
+
 PREFIX=$(DESTDIR)/usr
-# CONFDIR=/usr/local/lib/mandos
 CONFDIR=$(DESTDIR)/etc/mandos
-# KEYDIR=/usr/local/lib/mandos/keys
 KEYDIR=$(DESTDIR)/etc/keys/mandos
-# MANDIR=/usr/local/man
-MANDIR=$(DESTDIR)/usr/share/man
+MANDIR=$(PREFIX)/share/man
+INITRAMFSTOOLS=$(DESTDIR)/usr/share/initramfs-tools
 
 GNUTLS_CFLAGS=$(shell libgnutls-config --cflags)
 GNUTLS_LIBS=$(shell libgnutls-config --libs)
@@ -34,7 +39,7 @@
 	$(LANGUAGE) $(GNUTLS_CFLAGS) $(AVAHI_CFLAGS) $(GPGME_CFLAGS)
 LDFLAGS=$(COVERAGE)
 
-# Commands to format a DocBook refentry document into a manual page
+# Commands to format a DocBook <refentry> document into a manual page
 DOCBOOKTOMAN=cd $(dir $<); xsltproc --nonet --xinclude \
 	--param man.charmap.use.subset		0 \
 	--param make.year.ranges		1 \
@@ -44,7 +49,7 @@
 	 /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
 	$(notdir $<); \
 	$(MANPOST) $(notdir $@)
-# DocBook-to-man post-processing to fix a \n escape bug
+# DocBook-to-man post-processing to fix a '\n' escape bug
 MANPOST=sed --in-place --expression='s,\\\\en,\\en,g;s,\\n,\\en,g'
 
 PLUGINS=plugins.d/password-prompt plugins.d/mandos-client
@@ -140,8 +145,10 @@
 		mandos.conf
 	install --mode=u=rw --target-directory=$(CONFDIR) \
 		clients.conf
-	install --mode=u=rwx,go=rx init.d-mandos /etc/init.d/mandos
-	install --mode=u=rw,go=r default-mandos /etc/default/mandos
+	install --mode=u=rwx,go=rx init.d-mandos \
+		$(DESTDIR)/etc/init.d/mandos
+	install --mode=u=rw,go=r default-mandos \
+		$(DESTDIR)/etc/default/mandos
 	update-rc.d mandos defaults
 	gzip --best --to-stdout mandos.8 \
 		> $(MANDIR)/man8/mandos.8.gz
@@ -150,7 +157,7 @@
 	gzip --best --to-stdout mandos-clients.conf.5 \
 		> $(MANDIR)/man5/mandos-clients.conf.5.gz
 
-install-client: all doc /usr/share/initramfs-tools/hooks/.
+install-client: all doc $(INITRAMFSTOOLS)/hooks/.
 	install --directory $(PREFIX)/lib/mandos $(CONFDIR) \
 		$(MANDIR)/man8
 	install --directory --mode=u=rwx $(KEYDIR)
@@ -176,11 +183,11 @@
 		--target-directory=$(PREFIX)/lib/mandos/plugins.d \
 		plugins.d/usplash
 	install initramfs-tools-hook \
-		/usr/share/initramfs-tools/hooks/mandos
+		$(INITRAMFSTOOLS)/hooks/mandos
 	install initramfs-tools-hook-conf \
-		/usr/share/initramfs-tools/conf-hooks.d/mandos
+		$(INITRAMFSTOOLS)/conf-hooks.d/mandos
 	install initramfs-tools-script \
-		/usr/share/initramfs-tools/scripts/local-top/mandos
+		$(INITRAMFSTOOLS)/scripts/local-top/mandos
 	install --mode=u=rw,go=r plugin-runner.conf $(CONFDIR)
 	gzip --best --to-stdout mandos-keygen.8 \
 		> $(MANDIR)/man8/mandos-keygen.8.gz
@@ -209,15 +216,15 @@
 # Refuse to uninstall client if /etc/crypttab is explicitly configured
 # to use it.
 	! grep --regexp='^ *[^ #].*keyscript=[^,=]*/mandos/' \
-		/etc/crypttab
+		$(DESTDIR)/etc/crypttab
 	-rm --force $(PREFIX)/sbin/mandos-keygen \
 		$(PREFIX)/lib/mandos/plugin-runner \
 		$(PREFIX)/lib/mandos/plugins.d/password-prompt \
 		$(PREFIX)/lib/mandos/plugins.d/mandos-client \
 		$(PREFIX)/lib/mandos/plugins.d/usplash \
-		/usr/share/initramfs-tools/hooks/mandos \
-		/usr/share/initramfs-tools/conf-hooks.d/mandos \
-		/usr/share/initramfs-tools/scripts/local-top/mandos \
+		$(INITRAMFSTOOLS)/hooks/mandos \
+		$(INITRAMFSTOOLS)/conf-hooks.d/mandos \
+		$(INITRAMFSTOOLS)/scripts/local-top/mandos \
 		$(MANDIR)/man8/plugin-runner.8mandos.gz \
 		$(MANDIR)/man8/mandos-keygen.8.gz \
 		$(MANDIR)/man8/password-prompt.8mandos.gz \
@@ -233,8 +240,9 @@
 
 purge-server: uninstall-server
 	-rm --force $(CONFDIR)/mandos.conf $(CONFDIR)/clients.conf \
-		/etc/default/mandos /etc/init.d/mandos \
-		/var/run/mandos.pid
+		$(DESTDIR)/etc/default/mandos \
+		$(DESTDIR)/etc/init.d/mandos \
+		$(DESTDIR)/var/run/mandos.pid
 	-rmdir $(CONFDIR)
 
 purge-client: uninstall-client