--- Makefile.in.old	2005-12-27 20:38:13.000000000 +0100
+++ ../solidircd-3.4.8/Makefile.in	2006-08-29 12:55:33.000000000 +0200
@@ -31,7 +31,8 @@
 CFLAGS=@CFLAGS@
 LIBS=@LIBS@ 
 
-INSTALL_DIR=@INSTALL_DIR@
+INSTALL_DIR=$(DESTDIR)/@INSTALL_DIR@
+sysconfdir=$(DESTDIR)/@sysconfdir@
 
 all:	build
 
@@ -103,14 +104,18 @@
 		echo "Creating directory $(INSTALL_DIR)"; \
 		mkdir $(INSTALL_DIR); \
 	fi
+	@if test ! -d $(sysconfdir); then \
+		echo "Creating directory $(sysconfdir)"; \
+		mkdir $(sysconfdir); \
+	fi
 	@for i in $(INSTDIRS); do \
 		cd $$i; \
 		$(MAKE) install; \
 		cd ..; \
 	done
 	@echo ""
-	cp -Ri  ssl $(INSTALL_DIR)
-	@echo "Now edit $(INSTALL_DIR)/template.conf"
+	cp -Ri  ssl $(sysconfdir)
+	@echo "Now edit $(sysconfdir)/template.conf"
 	@echo "and move it to ircd.conf - and you'll be all set."
 	@echo "See the doc/ directory and the INSTALL file for more assistance"
 	@echo "Thank you for choosing solid-ircd!"
--- Makefile.in.src.old	2005-12-04 08:14:07.000000000 +0100
+++ ../solidircd-3.4.8/src/Makefile.in	2006-08-29 12:43:52.000000000 +0200
@@ -8,7 +8,8 @@
 CRYPTO=@ENCRYPT_SRC@
 INSTALL=@INSTALL@
 INSTALL_BIN=@INSTALL_PROGRAM@
-INSTALL_DIR=@INSTALL_DIR@
+#INSTALL_DIR=@INSTALL_DIR@
+INSTALL_DIR=$(DESTDIR)/@bindir@
 CFLAGS=@CFLAGS@
 
 RES_SRC =
--- Makefile.in.tools.old	2005-06-27 05:02:55.000000000 +0200
+++ ../solidircd-3.4.8/tools/Makefile.in	2006-08-29 12:44:09.000000000 +0200
@@ -4,7 +4,8 @@
 IRCDLIBS=@LIBS@
 INSTALL=@INSTALL@
 INSTALL_BIN=@INSTALL_PROGRAM@
-INSTALL_DIR=@INSTALL_DIR@
+#INSTALL_DIR=@INSTALL_DIR@
+INSTALL_DIR=$(DESTDIR)/@bindir@
 INCLUDEDIR=-I../include
 
 mkpasswd_SOURCES = mkpasswd.c
--- Makefile.in.doc.old	2006-03-12 20:47:50.000000000 +0100
+++ ../solidircd-3.4.8/doc/Makefile.in	2006-08-29 12:44:30.000000000 +0200
@@ -22,7 +22,8 @@
 
 INSTALL=@INSTALL@
 INSTALL_DATA=@INSTALL_DATA@
-INSTALL_DIR=@INSTALL_DIR@
+#INSTALL_DIR=@INSTALL_DIR@
+INSTALL_DIR=$(DESTDIR)/@sysconfdir@
 
 FILES=opers.txt reference.conf template.conf elmer.conf rehash