diff -urN ircd-hybrid-7.2.2-orig/contrib/Makefile.in ircd-hybrid-7.2.2/contrib/Makefile.in
--- ircd-hybrid-7.2.2-orig/contrib/Makefile.in	2006-07-17 06:31:27.000000000 +0000
+++ ircd-hybrid-7.2.2/contrib/Makefile.in	2006-09-02 16:29:11.000000000 +0000
@@ -17,7 +17,7 @@
 INSTALL		= @INSTALL@
 INSTALL_DATA	= @INSTALL_DATA@
 
-prefix		= $(DESTDIR)@prefix@
+prefix		= $(DESTDIR)@prefix@/lib/ircd-hybrid-7
 datarootdir	= $(DESTDIR)@datarootdir@
 
 AUTOMODULEDIR	= ${prefix}/modules
diff -urN ircd-hybrid-7.2.2-orig/contrib/help/Makefile.in ircd-hybrid-7.2.2/contrib/help/Makefile.in
--- ircd-hybrid-7.2.2-orig/contrib/help/Makefile.in	2006-07-17 06:31:27.000000000 +0000
+++ ircd-hybrid-7.2.2/contrib/help/Makefile.in	2006-09-02 16:30:28.000000000 +0000
@@ -5,7 +5,7 @@
 INSTALL_DATA=	@INSTALL_DATA@
 RM=		@RM@
 
-prefix=		@prefix@
+prefix=		${DESTDIR}/usr/share/ircd-hybrid-7
 exec_prefix=	@execprefix@
 datarootdir	= $(DESTDIR)@datarootdir@
 uhelpdir=	${prefix}/help/users
diff -urN ircd-hybrid-7.2.2-orig/help/Makefile.in ircd-hybrid-7.2.2/help/Makefile.in
--- ircd-hybrid-7.2.2-orig/help/Makefile.in	2006-07-17 06:31:26.000000000 +0000
+++ ircd-hybrid-7.2.2/help/Makefile.in	2006-09-02 16:32:19.000000000 +0000
@@ -5,7 +5,7 @@
 INSTALL_DATA	= @INSTALL_DATA@
 RM		= @RM@
 
-prefix		= @prefix@
+prefix		= ${DESTDIR}/usr/share/ircd-hybrid-7
 exec_prefix	= @execprefix@
 datarootdir	= $(DESTDIR)@datarootdir@
 uhelpdir	= ${prefix}/help/users
@@ -23,12 +23,12 @@
 install: 
 	@echo installing help files...
 	-@if test ! -d $(prefix)/help; then \
-		echo "mkdir $(prefix)/help"; \
-		mkdir $(prefix)/help; \
-		echo "mkdir $(prefix)/help/users"; \
-		mkdir $(prefix)/help/users; \
-		echo "mkdir $(prefix)/help/opers"; \
-		mkdir $(prefix)/help/opers; \
+		echo "mkdir -p $(prefix)/help"; \
+		mkdir -p $(prefix)/help; \
+		echo "mkdir -p $(prefix)/help/users"; \
+		mkdir -p $(prefix)/help/users; \
+		echo "mkdir -p $(prefix)/help/opers"; \
+		mkdir -p $(prefix)/help/opers; \
 	fi
 	@for help in opers/*; do \
 	if [ -f $$help ]; then \
diff -urN ircd-hybrid-7.2.2-orig/include/defaults.h ircd-hybrid-7.2.2/include/defaults.h
--- ircd-hybrid-7.2.2-orig/include/defaults.h	2006-07-17 06:31:22.000000000 +0000
+++ ircd-hybrid-7.2.2/include/defaults.h	2006-09-02 16:37:04.000000000 +0000
@@ -48,13 +48,13 @@
  */
 
 /* dirs */
-#define DPATH       IRCD_PREFIX                                                     
+#define DPATH       IRCD_PREFIX
 #define BINPATH     IRCD_PREFIX "/bin/"
-#define MSGPATH     IRCD_PREFIX "/messages/"
-#define ETCPATH     IRCD_PREFIX "/etc"
-#define LOGPATH     IRCD_PREFIX "/logs"
-#define MODPATH     IRCD_PREFIX "/modules/"
-#define AUTOMODPATH IRCD_PREFIX "/modules/autoload/"
+#define MSGPATH     IRCD_PREFIX "/share/ircd-hybrid-7/messages/"
+#define ETCPATH     "/etc/ircd"
+#define LOGPATH     "/var/log/ircd"
+#define MODPATH     IRCD_PREFIX "/lib/ircd-hybrid-7/modules/"
+#define AUTOMODPATH IRCD_PREFIX "/lib/ircd-hybrid-7/modules/autoload"
 
 /* files */
 #define SPATH   BINPATH "/ircd"                 /* ircd executable */
@@ -70,7 +70,7 @@
 #define RKPATH  ETCPATH "/rkline.conf"
 #define MPATH   ETCPATH "/ircd.motd"            /* MOTD file */
 #define LPATH   LOGPATH "/ircd.log"             /* ircd logfile */
-#define PPATH   ETCPATH "/ircd.pid"             /* pid file */
+#define PPATH   "/var/run/ircd/ircd.pid"        /* pid file */
 #define OPATH   ETCPATH "/opers.motd"           /* oper MOTD file */
 #define LIPATH  ETCPATH "/links.txt"            /* cached links file */
 
diff -urN ircd-hybrid-7.2.2-orig/modules/m_help.c ircd-hybrid-7.2.2/modules/m_help.c
--- ircd-hybrid-7.2.2-orig/modules/m_help.c	2006-07-17 06:31:35.000000000 +0000
+++ ircd-hybrid-7.2.2/modules/m_help.c	2006-09-02 16:38:31.000000000 +0000
@@ -36,8 +36,8 @@
 #include "modules.h"
 #include "irc_string.h"
 
-#define HPATH  IRCD_PREFIX "/help/opers"
-#define UHPATH IRCD_PREFIX "/help/users"
+#define HPATH  IRCD_PREFIX "/share/ircd-hybrid-7/help/opers"
+#define UHPATH IRCD_PREFIX "/share/ircd-hybrid-7/help/users"
 #define HELPLEN 400
 
 static void m_help(struct Client *, struct Client *, int, char *[]);