commit 950aeec3ff0e15c456ac32d8fecee8c73f7c5df3
from: Alexander Barton <alex@barton.de>
date: Tue Jan 01 18:25:06 2013 UTC

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

commit - 60a9a7f11860a3953d215a377d31714e02d09eba
commit + 950aeec3ff0e15c456ac32d8fecee8c73f7c5df3
blob - 84e27508c793721cade924c8ee25f743affbddcd
blob + 732e55ee01388280e2e858a86b686dee0826dbb4
--- configure.ng
+++ configure.ng
@@ -1,6 +1,6 @@
 #
 # 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
 # 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:
 test -n "$CFLAGS_ADD" && CFLAGS="$CFLAGS $CFLAGS_ADD"
 
-CFLAGS="$CFLAGS -DSYSCONFDIR='\"\$(sysconfdir)\"'"
+CFLAGS="$CFLAGS -DSYSCONFDIR='\"\$(sysconfdir)\"' -DDOCDIR='\"\$(docdir)\"'"
 
 # -- Headers --
 
blob - 6da74962c5551f56c32a456f3ecd7aace23d6998
blob + f4838276ecfddcb8bccd5a42b7fb1fc410d64a5d
--- contrib/MacOSX/config.h
+++ contrib/MacOSX/config.h
@@ -1,6 +1,6 @@
 /*
  * 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
  * it under the terms of the GNU General Public License as published by
@@ -17,6 +17,7 @@
 #define VERSION "??("__DATE__")"
 #endif
 #define SYSCONFDIR "/etc/ngircd"
+#define DOCDIR "/usr/share/doc/ngircd"
 
 #ifndef TARGET_VENDOR
 #define TARGET_VENDOR "apple"
blob - eb6fa93778927f9760c3a7bcad07f2489bbea2fb
blob + 04f74b6059acd132336f5527477d533297c6989a
--- doc/Makefile.am
+++ doc/Makefile.am
@@ -1,6 +1,6 @@
 #
 # 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
 # it under the terms of the GNU General Public License as published by
@@ -12,6 +12,7 @@
 .tmpl:
 	$(AM_V_GEN)sed \
 	    -e "s@:ETCDIR:@${sysconfdir}@" \
+	    -e "s@:DOCDIR:@${docdir}@" \
 	    <$< >$@
 
 SUFFIXES = .tmpl
blob - 3f80a9f9d7e675bc400ad4ea8184e2cd126db08a
blob + 1c3998ad61368fca9448013206c2cd35e5187779
--- doc/sample-ngircd.conf.tmpl
+++ doc/sample-ngircd.conf.tmpl
@@ -35,7 +35,7 @@
 
 	# Text file which contains the ngIRCd help text. This file is required
 	# 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
 	# LINKS requests for example.
blob - fa1bfba1da4d0872d39e016da6aa71982174216d
blob + d5a28bd7bfbe25ab3b8268781236edfe663954f2
--- src/ngircd/conf.c
+++ src/ngircd/conf.c
@@ -1,6 +1,6 @@
 /*
  * 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
  * 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);
 	strlcpy(Conf_MotdFile, SYSCONFDIR, 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));
 	strcpy(Conf_ServerPwd, "");
 	strlcpy(Conf_PidFile, PID_FILE, sizeof(Conf_PidFile));
blob - 28a260b86024acabba0530eb79d732ab965d5a56
blob + 3850b5810a0c8ad67e379339207bfe45ada45b97
--- src/ngircd/defines.h
+++ src/ngircd/defines.h
@@ -78,7 +78,7 @@
 #define MOTD_FILE "/ngircd.motd"
 
 /** Name of the help file. */
-#define HELP_FILE "/ngircd.help"
+#define HELP_FILE "/Commands.txt"
 
 /** Default chroot() directory. */
 #define CHROOT_DIR ""