albino
/
ngircd-tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use "${docdir}/Commands.txt" as help text file

This commit is contained in:
Alexander Barton 2013-01-01 19:25:06 +01:00
parent 60a9a7f118
commit 950aeec3ff
6 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ng
View File

@ -1,6 +1,6 @@
# #
# ngIRCd -- The Next Generation IRC Daemon # ngIRCd -- The Next Generation IRC Daemon
# Copyright (c)2001-2012 Alexander Barton (alex@barton.de) and Contributors # Copyright (c)2001-2013 Alexander Barton (alex@barton.de) and Contributors
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -110,7 +110,7 @@ esac
# Add additional CFLAGS, eventually specified on the command line: # Add additional CFLAGS, eventually specified on the command line:
test -n "$CFLAGS_ADD" && CFLAGS="$CFLAGS $CFLAGS_ADD" test -n "$CFLAGS_ADD" && CFLAGS="$CFLAGS $CFLAGS_ADD"
CFLAGS="$CFLAGS -DSYSCONFDIR='\"\$(sysconfdir)\"'" CFLAGS="$CFLAGS -DSYSCONFDIR='\"\$(sysconfdir)\"' -DDOCDIR='\"\$(docdir)\"'"
# -- Headers -- # -- Headers --

3
contrib/MacOSX/config.h
View File

@ -1,6 +1,6 @@
/* /*
* ngIRCd -- The Next Generation IRC Daemon * ngIRCd -- The Next Generation IRC Daemon
* Copyright (c)2001-2012 Alexander Barton (alex@barton.de) and Contributors. * Copyright (c)2001-2013 Alexander Barton (alex@barton.de) and Contributors.
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -17,6 +17,7 @@
#define VERSION "??("__DATE__")" #define VERSION "??("__DATE__")"
#endif #endif
#define SYSCONFDIR "/etc/ngircd" #define SYSCONFDIR "/etc/ngircd"
#define DOCDIR "/usr/share/doc/ngircd"
#ifndef TARGET_VENDOR #ifndef TARGET_VENDOR
#define TARGET_VENDOR "apple" #define TARGET_VENDOR "apple"

3
doc/Makefile.am
View File

@ -1,6 +1,6 @@
# #
# ngIRCd -- The Next Generation IRC Daemon # ngIRCd -- The Next Generation IRC Daemon
# Copyright (c)2001-2012 Alexander Barton (alex@barton.de) and Contributors # Copyright (c)2001-2013 Alexander Barton (alex@barton.de) and Contributors
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -12,6 +12,7 @@
.tmpl: .tmpl:
$(AM_V_GEN)sed \ $(AM_V_GEN)sed \
-e "s@:ETCDIR:@${sysconfdir}@" \ -e "s@:ETCDIR:@${sysconfdir}@" \
-e "s@:DOCDIR:@${docdir}@" \
<$< >$@ <$< >$@
SUFFIXES = .tmpl SUFFIXES = .tmpl

2
doc/sample-ngircd.conf.tmpl
View File

@ -35,7 +35,7 @@
# Text file which contains the ngIRCd help text. This file is required # Text file which contains the ngIRCd help text. This file is required
# to display help texts when using the "HELP <cmd>" command. # to display help texts when using the "HELP <cmd>" command.
;HelpFile = :ETCDIR:/ngircd.help ;HelpFile = :DOCDIR:/Commands.txt
# Info text of the server. This will be shown by WHOIS and # Info text of the server. This will be shown by WHOIS and
# LINKS requests for example. # LINKS requests for example.

4
src/ngircd/conf.c
View File

@ -1,6 +1,6 @@
/* /*
* ngIRCd -- The Next Generation IRC Daemon * ngIRCd -- The Next Generation IRC Daemon
* Copyright (c)2001-2012 Alexander Barton (alex@barton.de) and Contributors. * Copyright (c)2001-2013 Alexander Barton (alex@barton.de) and Contributors.
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -706,7 +706,7 @@ Set_Defaults(bool InitServers)
array_free(&Conf_Helptext); array_free(&Conf_Helptext);
strlcpy(Conf_MotdFile, SYSCONFDIR, sizeof(Conf_MotdFile)); strlcpy(Conf_MotdFile, SYSCONFDIR, sizeof(Conf_MotdFile));
strlcat(Conf_MotdFile, MOTD_FILE, sizeof(Conf_MotdFile)); strlcat(Conf_MotdFile, MOTD_FILE, sizeof(Conf_MotdFile));
strlcpy(Conf_HelpFile, SYSCONFDIR, sizeof(Conf_HelpFile)); strlcpy(Conf_HelpFile, DOCDIR, sizeof(Conf_HelpFile));
strlcat(Conf_HelpFile, HELP_FILE, sizeof(Conf_HelpFile)); strlcat(Conf_HelpFile, HELP_FILE, sizeof(Conf_HelpFile));
strcpy(Conf_ServerPwd, ""); strcpy(Conf_ServerPwd, "");
strlcpy(Conf_PidFile, PID_FILE, sizeof(Conf_PidFile)); strlcpy(Conf_PidFile, PID_FILE, sizeof(Conf_PidFile));

2
src/ngircd/defines.h
View File

@ -78,7 +78,7 @@
#define MOTD_FILE "/ngircd.motd" #define MOTD_FILE "/ngircd.motd"
/** Name of the help file. */ /** Name of the help file. */
#define HELP_FILE "/ngircd.help" #define HELP_FILE "/Commands.txt"
/** Default chroot() directory. */ /** Default chroot() directory. */
#define CHROOT_DIR "" #define CHROOT_DIR ""