Final cleanup for version 1.2.

* configure.ac (INETD_SH): Rename to INETD.
* NEWS: Update.
* src/.gitignore (inetd.sh): rename to inetd.
* doc/pies.texi: Update.
* src/Makefile.am (pkgstatedir): New variable.
(AM_CPPFLAGS): Add define.
(inetd.sh): Replace with inetd.
(install-exec-hook): Remove.
* src/pies.c (statedir): New variable.
(pies_keywords): New keyword: "state-directory".
(set_file_names): Split in two functions:
(set_conf_file_names, set_state_file_names).
(main): Call set_conf_file_names before,
and set_state_file_names after parsing the configs.

1 files changed, 18 insertions, 10 deletions

diff --git a/doc/pies.texi b/doc/pies.texi
index 04c85a4..b6f2c91 100644
--- a/doc/pies.texi
+++ b/doc/pies.texi
@@ -277,9 +277,9 @@ in a single command line, e.g.:
 
 @smallexample
 @group
-pies /etc/pies.conf \
-    --syntax=inetd --config-file /etc/inetd.conf \
-    --syntax=meta1 --config-file /etc/meta1/meta1.conf
+pies --config-file /etc/pies.conf \
+     --syntax=inetd --config-file /etc/inetd.conf \
+     --syntax=meta1 --config-file /etc/meta1/meta1.conf
 @end group
 @end smallexample
 
@@ -2051,11 +2051,18 @@ start @command{jabberd} components:
 @node State Files
 @section State Files
 @cindex state files
-  Pies uses several files to keep its state information.  These files
-are kept in local state directory (usually @file{/var/run/pies}, or
-@file{/usr/local/var/run/pies}).  The table below describes these
-files.  The @var{instance} in this table stands for the @command{pies}
-instance name (@pxref{instances}).  Usually, it is @samp{pies}.
+  Pies uses several files to keep its state information.  The
+directory which hosts these files is called @dfn{state directory}, it
+is usually @file{/var/pies} or @file{/usr/local/var/pies}).  The state
+directory can be configured at run time:
+
+@deffn {Config} state-directory @var{dir}
+Set the program state directory.
+@end deffn
+
+The table below describes the files kept in the state directory.  The
+@var{instance} in this table stands for the @command{pies} instance
+name (@pxref{instances}).  Usually, it is @samp{pies}. 
 
 @table @asis
 @item @file{@var{instance}.pid}
@@ -2076,8 +2083,9 @@ built-in service (@pxref{qotd}).
 @end table
 
   The following statements allow to redefine state file names.
-Use them only if the defaults does not suit your needs, and the
-@option{--instance} option does not help:
+Use them only if the defaults do not suit your needs, and niether
+the @code{state-directory} statement nor the @option{--instance}
+can help: 
 
 @deffn {Config} pidfile @var{file}
 Sets the PID file name.