Attachment #139266 for bug #196297

Lines 5-11 Link Here

(-)ircd-hybrid-7.2.3-orig/contrib/help/Makefile.in (-1 / +1 lines)
5	INSTALL_DATA= @INSTALL_DATA@	5	INSTALL_DATA= @INSTALL_DATA@
6	RM= @RM@	6	RM= @RM@
7		7
8	prefix= @prefix@	8	prefix= ${DESTDIR}/usr/share/ircd-hybrid-7
9	exec_prefix= @execprefix@	9	exec_prefix= @execprefix@
10	datarootdir = $(DESTDIR)@datarootdir@	10	datarootdir = $(DESTDIR)@datarootdir@
11	uhelpdir= ${prefix}/help/users	11	uhelpdir= ${prefix}/help/users




INSTALL_DATA	= @INSTALL_DATA@
RM		= @RM@

prefix		= ${DESTDIR}/usr/share/ircd-hybrid-7
exec_prefix	= @execprefix@
datarootdir	= $(DESTDIR)@datarootdir@
uhelpdir	= ${prefix}/help/users

install: 
	@echo installing help files...
	-@if test ! -d $(prefix)/help; then \
		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 \




 */

/* dirs */
#define DPATH       IRCD_PREFIX
#define BINPATH     IRCD_PREFIX "/bin/"
#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 */

#define RKPATH  ETCPATH "/rkline.conf"
#define MPATH   ETCPATH "/ircd.motd"            /* MOTD file */
#define LPATH   LOGPATH "/ircd.log"             /* ircd logfile */
#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 */


Lines 36-43 Link Here

(-)ircd-hybrid-7.2.3-orig/modules/m_help.c (-2 / +2 lines)
36	#include "modules.h"	36	#include "modules.h"
37	#include "irc_string.h"	37	#include "irc_string.h"
38		38
39	#define HPATH IRCD_PREFIX "/help/opers"	39	#define HPATH IRCD_PREFIX "/share/ircd-hybrid-7/help/opers"
40	#define UHPATH IRCD_PREFIX "/help/users"	40	#define UHPATH IRCD_PREFIX "/share/ircd-hybrid-7/help/users"
41	#define HELPLEN 400	41	#define HELPLEN 400
42		42
43	static void m_help(struct Client , struct Client , int, char *[]);	43	static void m_help(struct Client , struct Client , int, char *[]);

Return to bug 196297

Lines 48-60 Link Here

(-)ircd-hybrid-7.2.3-orig/include/defaults.h (-7 / +7 lines)
48	*/	48	*/
49		49
50	/* dirs */	50	/* dirs */
51	#define DPATH IRCD_PREFIX	51	#define DPATH IRCD_PREFIX
52	#define BINPATH IRCD_PREFIX "/bin/"	52	#define BINPATH IRCD_PREFIX "/bin/"
53	#define MSGPATH IRCD_PREFIX "/messages/"	53	#define MSGPATH IRCD_PREFIX "/share/ircd-hybrid-7/messages/"
54	#define ETCPATH IRCD_PREFIX "/etc"	54	#define ETCPATH "/etc/ircd"
55	#define LOGPATH IRCD_PREFIX "/logs"	55	#define LOGPATH "/var/log/ircd"
56	#define MODPATH IRCD_PREFIX "/modules/"	56	#define MODPATH IRCD_PREFIX "/lib/ircd-hybrid-7/modules/"
57	#define AUTOMODPATH IRCD_PREFIX "/modules/autoload/"	57	#define AUTOMODPATH IRCD_PREFIX "/lib/ircd-hybrid-7/modules/autoload"
58		58
59	/* files */	59	/* files */
60	#define SPATH BINPATH "/ircd" /* ircd executable */	60	#define SPATH BINPATH "/ircd" /* ircd executable */
Lines 70-76 Link Here
70	#define RKPATH ETCPATH "/rkline.conf"	70	#define RKPATH ETCPATH "/rkline.conf"
71	#define MPATH ETCPATH "/ircd.motd" /* MOTD file */	71	#define MPATH ETCPATH "/ircd.motd" /* MOTD file */
72	#define LPATH LOGPATH "/ircd.log" /* ircd logfile */	72	#define LPATH LOGPATH "/ircd.log" /* ircd logfile */
73	#define PPATH ETCPATH "/ircd.pid" /* pid file */	73	#define PPATH "/var/run/ircd/ircd.pid" /* pid file */
74	#define OPATH ETCPATH "/opers.motd" /* oper MOTD file */	74	#define OPATH ETCPATH "/opers.motd" /* oper MOTD file */
75	#define LIPATH ETCPATH "/links.txt" /* cached links file */	75	#define LIPATH ETCPATH "/links.txt" /* cached links file */
76		76

Lines 5-11 Link Here

(-)ircd-hybrid-7.2.3-orig/help/Makefile.in (-7 / +7 lines)
5	INSTALL_DATA = @INSTALL_DATA@	5	INSTALL_DATA = @INSTALL_DATA@
6	RM = @RM@	6	RM = @RM@
7		7
8	prefix = @prefix@	8	prefix = ${DESTDIR}/usr/share/ircd-hybrid-7
9	exec_prefix = @execprefix@	9	exec_prefix = @execprefix@
10	datarootdir = $(DESTDIR)@datarootdir@	10	datarootdir = $(DESTDIR)@datarootdir@
11	uhelpdir = ${prefix}/help/users	11	uhelpdir = ${prefix}/help/users
Lines 23-34 Link Here
23	install:	23	install:
24	@echo installing help files...	24	@echo installing help files...
25	-@if test ! -d $(prefix)/help; then \	25	-@if test ! -d $(prefix)/help; then \
26	echo "mkdir $(prefix)/help"; \	26	echo "mkdir -p $(prefix)/help"; \
27	mkdir $(prefix)/help; \	27	mkdir -p $(prefix)/help; \
28	echo "mkdir $(prefix)/help/users"; \	28	echo "mkdir -p $(prefix)/help/users"; \
29	mkdir $(prefix)/help/users; \	29	mkdir -p $(prefix)/help/users; \
30	echo "mkdir $(prefix)/help/opers"; \	30	echo "mkdir -p $(prefix)/help/opers"; \
31	mkdir $(prefix)/help/opers; \	31	mkdir -p $(prefix)/help/opers; \
32	fi	32	fi
33	@for help in opers/*; do \	33	@for help in opers/*; do \
34	if [ -f $$help ]; then \	34	if [ -f $$help ]; then \