Index: crypto/Makefile.in
===================================================================
--- crypto/Makefile.in	(revision 6888)
+++ crypto/Makefile.in	(working copy)
@@ -43,8 +43,8 @@
 build: all
 
 install: build
-	${INSTALL} -d ${MODDIR}/crypto
-	${INSTALL} -m 755 *.so ${MODDIR}/crypto
+	${INSTALL} -d $(DESTDIR)${MODDIR}/crypto
+	${INSTALL} -m 755 *.so $(DESTDIR)${MODDIR}/crypto
 
 protocols: $(OBJS)
 
Index: backend/Makefile.in
===================================================================
--- backend/Makefile.in	(revision 6888)
+++ backend/Makefile.in	(working copy)
@@ -43,8 +43,8 @@
 build: all
 
 install: build
-	${INSTALL} -d ${MODDIR}/backend
-	${INSTALL} -m 755 *.so ${MODDIR}/backend
+	${INSTALL} -d $(DESTDIR)${MODDIR}/backend
+	${INSTALL} -m 755 *.so $(DESTDIR)${MODDIR}/backend
 
 protocols: $(OBJS)
 
Index: src/Makefile.in
===================================================================
--- src/Makefile.in	(revision 6888)
+++ src/Makefile.in	(working copy)
@@ -100,25 +100,25 @@
 	  -e 's/real = "Nickname Services";/real = "User Registration Services";/' ../dist/example.conf) >../dist/example.userserv.conf
 
 install: build
-	$(INSTALL) -m 755 -d $(prefix)
-	$(INSTALL) -m 755 -d $(prefix)/bin
-	$(INSTALL) -m 755 -d $(prefix)/etc
-	$(INSTALL) -m 755 -d $(prefix)/var
-	$(INSTALL) -m 755 -d $(DOCDIR)
-	$(INSTALL) -m 755 -d $(SHAREDIR)/help
-	$(INSTALL) -m 755 -c $(BIN) $(prefix)/bin
-	$(INSTALL) -m 640 -c ../dist/example.conf $(prefix)/etc
-	$(INSTALL) -m 640 -c ../dist/example.motd $(prefix)/etc
-	$(INSTALL) -m 640 -c ../dist/example.userserv.conf $(prefix)/etc
-	$(INSTALL) -m 640 -c ../dist/atheme.chk $(prefix)/etc/atheme.chk.sample
-	(cd ../doc; for i in *; do $(INSTALL) -m 644 $$i $(DOCDIR); done)
+	$(INSTALL) -m 755 -d $(DESTDIR)$(prefix)
+	$(INSTALL) -m 755 -d $(DESTDIR)$(prefix)/bin
+	$(INSTALL) -m 755 -d $(DESTDIR)$(prefix)/etc
+	$(INSTALL) -m 755 -d $(DESTDIR)$(prefix)/var
+	$(INSTALL) -m 755 -d $(DESTDIR)$(DOCDIR)
+	$(INSTALL) -m 755 -d $(DESTDIR)$(SHAREDIR)/help
+	$(INSTALL) -m 755 -c $(BIN) $(DESTDIR)$(prefix)/bin
+	$(INSTALL) -m 640 -c ../dist/example.conf $(DESTDIR)$(prefix)/etc
+	$(INSTALL) -m 640 -c ../dist/example.motd $(DESTDIR)$(prefix)/etc
+	$(INSTALL) -m 640 -c ../dist/example.userserv.conf $(DESTDIR)$(prefix)/etc
+	$(INSTALL) -m 640 -c ../dist/atheme.chk $(DESTDIR)$(prefix)/etc/atheme.chk.sample
+	(cd ../doc; for i in *; do $(INSTALL) -m 644 $$i $(DESTDIR)$(DOCDIR); done)
 	(cd ../help; for i in *; do \
-		[ -f $$i ] && $(INSTALL) -m 644 $$i $(SHAREDIR)/help; \
+		[ -f $$i ] && $(INSTALL) -m 644 $$i $(DESTDIR)$(SHAREDIR)/help; \
 		if [ -d $$i ]; then \
 			cd $$i; \
-			$(INSTALL) -m 755 -d $(SHAREDIR)/help/$$i; \
+			$(INSTALL) -m 755 -d $(DESTDIR)$(SHAREDIR)/help/$$i; \
 			for j in *; do \
-				[ -f $$j ] && $(INSTALL) -m 644 $$j $(SHAREDIR)/help/$$i; \
+				[ -f $$j ] && $(INSTALL) -m 644 $$j $(DESTDIR)$(SHAREDIR)/help/$$i; \
 			done; \
 			cd ..; \
 		fi; \
Index: contrib/Makefile.in
===================================================================
--- contrib/Makefile.in	(revision 6888)
+++ contrib/Makefile.in	(working copy)
@@ -57,8 +57,8 @@
 all: ${OBJS}
 
 install:
-	${INSTALL} -d ${MODDIR}/contrib
-	${INSTALL} -m 755 *.so ${MODDIR}/contrib
+	${INSTALL} -d $(DESTDIR)${MODDIR}/contrib
+	${INSTALL} -m 755 *.so $(DESTDIR)${MODDIR}/contrib
 
 .SUFFIXES: .so
 
Index: protocol/Makefile.in
===================================================================
--- protocol/Makefile.in	(revision 6888)
+++ protocol/Makefile.in	(working copy)
@@ -63,8 +63,8 @@
 build: all
 
 install: build
-	${INSTALL} -d ${MODDIR}/protocol
-	${INSTALL} -m 755 *.so ${MODDIR}/protocol
+	${INSTALL} -d $(DESTDIR)${MODDIR}/protocol
+	${INSTALL} -m 755 *.so $(DESTDIR)${MODDIR}/protocol
 
 protocols: $(OBJS)
 
Index: modules/global/Makefile.in
===================================================================
--- modules/global/Makefile.in	(revision 6888)
+++ modules/global/Makefile.in	(working copy)
@@ -43,8 +43,8 @@
 build: all
 
 install: build
-	${INSTALL} -d ${MODDIR}/modules/global
-	${INSTALL} -m 755 *.so ${MODDIR}/modules/global
+	${INSTALL} -d $(DESTDIR)${MODDIR}/modules/global
+	${INSTALL} -m 755 *.so $(DESTDIR)${MODDIR}/modules/global
 
 modules: $(OBJS)
 
Index: modules/saslserv/Makefile.in
===================================================================
--- modules/saslserv/Makefile.in	(revision 6888)
+++ modules/saslserv/Makefile.in	(working copy)
@@ -44,9 +44,10 @@
 
 # Remove the old sasl.so and help.so as loading them can cause trouble
 install: build
-	${INSTALL} -d ${MODDIR}/modules/saslserv
-	${INSTALL} -m 755 *.so ${MODDIR}/modules/saslserv
-	-${RM} -f ${MODDIR}/modules/saslserv/sasl.so ${MODDIR}/modules/saslserv/help.so
+	${INSTALL} -d $(DESTDIR)${MODDIR}/modules/saslserv
+	${INSTALL} -m 755 *.so $(DESTDIR)${MODDIR}/modules/saslserv
+	-${RM} -f $(DESTDIR)${MODDIR}/modules/saslserv/sasl.so \
+		  $(DESTDIR)${MODDIR}/modules/saslserv/help.so
 
 modules: $(OBJS)
 
Index: modules/nickserv/Makefile.in
===================================================================
--- modules/nickserv/Makefile.in	(revision 6888)
+++ modules/nickserv/Makefile.in	(working copy)
@@ -67,8 +67,8 @@
 build: all
 
 install: build
-	${INSTALL} -d ${MODDIR}/modules/nickserv
-	${INSTALL} -m 755 *.so ${MODDIR}/modules/nickserv
+	${INSTALL} -d $(DESTDIR)${MODDIR}/modules/nickserv
+	${INSTALL} -m 755 *.so $(DESTDIR)${MODDIR}/modules/nickserv
 
 modules: $(OBJS)
 
Index: modules/operserv/Makefile.in
===================================================================
--- modules/operserv/Makefile.in	(revision 6888)
+++ modules/operserv/Makefile.in	(working copy)
@@ -70,8 +70,8 @@
 build: all
 
 install: build
-	${INSTALL} -d ${MODDIR}/modules/operserv
-	${INSTALL} -m 755 *.so ${MODDIR}/modules/operserv
+	${INSTALL} -d $(DESTDIR)${MODDIR}/modules/operserv
+	${INSTALL} -m 755 *.so $(DESTDIR)${MODDIR}/modules/operserv
 
 modules: $(OBJS)
 
Index: modules/xmlrpc/Makefile.in
===================================================================
--- modules/xmlrpc/Makefile.in	(revision 6888)
+++ modules/xmlrpc/Makefile.in	(working copy)
@@ -47,8 +47,8 @@
 build: all
 
 install: build
-	${INSTALL} -d ${MODDIR}/modules/xmlrpc
-	${INSTALL} -m 755 *.so ${MODDIR}/modules/xmlrpc
+	${INSTALL} -d $(DESTDIR)${MODDIR}/modules/xmlrpc
+	${INSTALL} -m 755 *.so $(DESTDIR)${MODDIR}/modules/xmlrpc
 
 modules: $(OBJS)
 
Index: modules/chanserv/Makefile.in
===================================================================
--- modules/chanserv/Makefile.in	(revision 6888)
+++ modules/chanserv/Makefile.in	(working copy)
@@ -75,8 +75,8 @@
 build: all
 
 install: build
-	${INSTALL} -d ${MODDIR}/modules/chanserv
-	${INSTALL} -m 755 *.so ${MODDIR}/modules/chanserv
+	${INSTALL} -d $(DESTDIR)${MODDIR}/modules/chanserv
+	${INSTALL} -m 755 *.so $(DESTDIR)${MODDIR}/modules/chanserv
 
 modules: $(OBJS)
 
Index: modules/memoserv/Makefile.in
===================================================================
--- modules/memoserv/Makefile.in	(revision 6888)
+++ modules/memoserv/Makefile.in	(working copy)
@@ -52,8 +52,8 @@
 build: all
 
 install: build
-	${INSTALL} -d ${MODDIR}/modules/memoserv
-	${INSTALL} -m 755 *.so ${MODDIR}/modules/memoserv
+	${INSTALL} -d $(DESTDIR)${MODDIR}/modules/memoserv
+	${INSTALL} -m 755 *.so $(DESTDIR)${MODDIR}/modules/memoserv
 
 modules: $(OBJS)