Fix BROKEN.

ircd-hybrid now complies with hier(7) and runs. Good work, Brad!

Submitted by:	maintainer
This commit is contained in:
Erwin Lansing 2004-01-30 07:09:26 +00:00
parent 9b55c8e0b3
commit 202ccd5700
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=99466
4 changed files with 25 additions and 41 deletions

View file

@ -21,8 +21,6 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes GNU_CONFIGURE= yes
USE_REINPLACE= yes USE_REINPLACE= yes
BROKEN= Does not run
# #
# User Configurable Variables # User Configurable Variables
# #

View file

@ -1,24 +1,32 @@
--- include/config.h.ori Wed Jan 28 01:57:26 2004 --- include/config.h.orig Thu Feb 6 01:46:11 2003
+++ include/config.h Wed Jan 28 02:03:47 2004 +++ include/config.h Thu Jan 29 20:16:13 2004
@@ -93,8 +93,10 @@ @@ -90,7 +90,9 @@
/*#define IRCD_PREFIX "IRCD$BASEDIR:"*/
#define DPATH "IRCD$BASEDIR:"
#define BINPATH "IRCD$BINDIR:"
+/*
#define ETCPATH "IRCD$CONFDIR:" #define ETCPATH "IRCD$CONFDIR:"
+*/
#define LOGPATH "IRCD$LOGDIR:" #define LOGPATH "IRCD$LOGDIR:"
+/*
#undef MODPATH #undef MODPATH
#undef AUTOMODPATH @@ -134,13 +136,13 @@
+*/
#undef MSGPATH
#define SPATH BINPATH "IRCD.EXE" /* server executable */
@@ -134,8 +136,10 @@
/* dirs */ /* dirs */
#define DPATH IRCD_PREFIX #define DPATH IRCD_PREFIX
#define BINPATH IRCD_PREFIX "/bin/" #define BINPATH IRCD_PREFIX "/bin/"
+/* -#define MODPATH IRCD_PREFIX "/modules/"
#define MODPATH IRCD_PREFIX "/modules/" -#define AUTOMODPATH IRCD_PREFIX "/modules/autoload/"
#define AUTOMODPATH IRCD_PREFIX "/modules/autoload/" -#define MSGPATH IRCD_PREFIX "/messages/"
+*/ -#define ETCPATH IRCD_PREFIX "/etc"
#define MSGPATH IRCD_PREFIX "/messages/" +#define MODPATH IRCD_PREFIX "/share/ircd-hybrid-7.0/modules/"
#define ETCPATH IRCD_PREFIX "/etc" +#define AUTOMODPATH IRCD_PREFIX "/share/ircd-hybrid-7.0/modules/autoload/"
+#define MSGPATH IRCD_PREFIX "/share/ircd-hybrid-7.0/messages/"
+#define ETCPATH IRCD_PREFIX "/etc/ircd-hybrid"
#define LOGPATH IRCD_PREFIX "/logs" #define LOGPATH IRCD_PREFIX "/logs"
-#define UHPATH IRCD_PREFIX "/help/users"
-#define HPATH IRCD_PREFIX "/help/opers"
+#define UHPATH IRCD_PREFIX "/share/ircd-hybrid-7.0/help/users"
+#define HPATH IRCD_PREFIX "/share/ircd-hybrid-7.0/help/opers"
/* files */
#define SPATH BINPATH "/ircd" /* ircd executable */

View file

@ -1,14 +1,5 @@
--- src/Makefile.in.orig Wed May 28 21:02:15 2003 --- src/Makefile.in.orig Wed May 28 21:02:15 2003
+++ src/Makefile.in Wed Jan 28 01:19:55 2004 +++ src/Makefile.in Thu Jan 29 19:54:25 2004
@@ -11,7 +11,7 @@
RM = @RM@
LEX = @LEX@
LEXLIB = @LEXLIB@
-CFLAGS = @IRC_CFLAGS@ -DIRCD_PREFIX=\"@prefix@\"
+CFLAGS = @IRC_CFLAGS@ -DIRCD_PREFIX=\"@prefix@\" -DMODPATH=\"@moduledir@\" -DAUTOMODPATH=\"@moduledir@/autoload\"
LDFLAGS = @LDFLAGS@
MKDEP = @MKDEP@ -DIRCD_PREFIX=\"@prefix@\"
MV = @MV@
@@ -23,6 +23,8 @@ @@ -23,6 +23,8 @@
libexecdir = @libexecdir@ libexecdir = @libexecdir@
sysconfdir = @sysconfdir@ sysconfdir = @sysconfdir@

View file

@ -1,13 +0,0 @@
--- src/ircd.c.orig Wed May 28 23:13:26 2003
+++ src/ircd.c Wed Jan 28 01:50:45 2004
@@ -662,8 +662,8 @@
read_conf_files(YES); /* cold start init conf files */
#ifndef STATIC_MODULES
- mod_add_path(IRCD_PREFIX "/modules");
- mod_add_path(IRCD_PREFIX "/modules/autoload");
+ mod_add_path(MODPATH);
+ mod_add_path(AUTOMODPATH);
#endif
initialize_server_capabs(); /* Set up default_server_capabs */