1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
|
diff -urN ircd-hybrid-7.2.1.orig/contrib/Makefile.in ircd-hybrid-7.2.1/contrib/Makefile.in
--- ircd-hybrid-7.2.1.orig/contrib/Makefile.in 2006-03-27 01:36:56.000000000 +0200
+++ ircd-hybrid-7.2.1/contrib/Makefile.in 2006-06-04 22:00:40.000000000 +0200
@@ -17,7 +17,7 @@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
-prefix = $(DESTDIR)@prefix@
+prefix = $(DESTDIR)@prefix@/lib/ircd-hybrid-7
AUTOMODULEDIR = ${prefix}/modules
diff -urN ircd-hybrid-7.2.1.orig/contrib/help/Makefile.in ircd-hybrid-7.2.1/contrib/help/Makefile.in
--- ircd-hybrid-7.2.1.orig/contrib/help/Makefile.in 2006-03-27 01:36:56.000000000 +0200
+++ ircd-hybrid-7.2.1/contrib/help/Makefile.in 2006-06-04 21:49:59.000000000 +0200
@@ -5,7 +5,7 @@
INSTALL_DATA= @INSTALL_DATA@
RM= @RM@
-prefix= @prefix@
+prefix= ${DESTDIR}/usr/share/ircd-hybrid-7
exec_prefix= @execprefix@
uhelpdir= ${prefix}/help/users
ohelpdir= ${prefix}/help/opers
diff -urN ircd-hybrid-7.2.1.orig/help/Makefile.in ircd-hybrid-7.2.1/help/Makefile.in
--- ircd-hybrid-7.2.1.orig/help/Makefile.in 2006-03-27 01:36:55.000000000 +0200
+++ ircd-hybrid-7.2.1/help/Makefile.in 2006-06-04 21:58:23.000000000 +0200
@@ -5,7 +5,7 @@
INSTALL_DATA= @INSTALL_DATA@
RM= @RM@
-prefix= @prefix@
+prefix= ${DESTDIR}/usr/share/ircd-hybrid-7
exec_prefix= @execprefix@
uhelpdir= ${prefix}/help/users
ohelpdir= ${prefix}/help/opers
@@ -22,12 +22,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.1.orig/include/defaults.h ircd-hybrid-7.2.1/include/defaults.h
--- ircd-hybrid-7.2.1.orig/include/defaults.h 2006-03-27 01:36:51.000000000 +0200
+++ ircd-hybrid-7.2.1/include/defaults.h 2006-06-04 16:04:45.000000000 +0200
@@ -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.1.orig/modules/m_help.c ircd-hybrid-7.2.1/modules/m_help.c
--- ircd-hybrid-7.2.1.orig/modules/m_help.c 2006-03-27 01:37:02.000000000 +0200
+++ ircd-hybrid-7.2.1/modules/m_help.c 2006-06-04 16:07:18.000000000 +0200
@@ -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 *[]);
|
GitWeb