[lwatch-cvs] files/doc Makefile.am,1.20,1.21 Makefile.in,1.19,1.20 conf.ent.in,1.4,1.5 lwatch.1.in,1.7,1.8 lwatch.sgml,1.12,1.13

[<ar...@us...>]

Update of /cvsroot/lwatch/files/doc
In directory sc8-pr-cvs1:/tmp/cvs-serv26252/doc

Modified Files:
	Makefile.am Makefile.in conf.ent.in lwatch.1.in lwatch.sgml 
Log Message:
 - build-in default input file could be changed during build time with
   ./configure --enable-input=file


Index: Makefile.am
===================================================================
RCS file: /cvsroot/lwatch/files/doc/Makefile.am,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** Makefile.am	22 Mar 2003 18:36:00 -0000	1.20
--- Makefile.am	24 Mar 2003 13:43:21 -0000	1.21
***************
*** 1,13 ****
  man_MANS = lwatch.1
  EXTRA_DIST = lwatch.sgml conf.ent.in lwatch.1.in
! CLEANFILES = lwatch.1 conf.ent
  
  if HAVE_D2M
  lwatch.1: lwatch.sgml conf.ent.in
! 	$(SED) -e "s#@CONFDIR\@#$(sysconfdir)#g" -e "s#@BINDIR\@#$(bindir)#g" < conf.ent.in > conf.ent
  	$(dbook2man) lwatch.sgml > lwatch.1
  else
  lwatch.1: lwatch.1.in Makefile
! 	$(SED) -e "s#@CONFDIR\@#$(sysconfdir)#g" -e "s#@BINDIR\@#$(bindir)#g" < lwatch.1.in > lwatch.1
  endif
  
--- 1,16 ----
  man_MANS = lwatch.1
  EXTRA_DIST = lwatch.sgml conf.ent.in lwatch.1.in
! CLEANFILES = lwatch.1 conf.ent lwatch.txt manpage.links manpage.refs
! 
! sed_prog = -e 's!@CONFDIR\@!$(sysconfdir)!g' -e 's!@BINDIR\@!$(bindir)!g' -e 's!@INPUTFILE\@!$(INPUTFILE)!g'
! 
  
  if HAVE_D2M
  lwatch.1: lwatch.sgml conf.ent.in
! 	$(SED) $(sed_prog) < conf.ent.in > conf.ent
  	$(dbook2man) lwatch.sgml > lwatch.1
  else
  lwatch.1: lwatch.1.in Makefile
! 	$(SED) $(sed_prog) < lwatch.1.in > lwatch.1
  endif
  

Index: Makefile.in
===================================================================
RCS file: /cvsroot/lwatch/files/doc/Makefile.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** Makefile.in	22 Mar 2003 18:36:00 -0000	1.19
--- Makefile.in	24 Mar 2003 13:43:21 -0000	1.20
***************
*** 60,63 ****
--- 60,64 ----
  HAVE_D2M_FALSE = @HAVE_D2M_FALSE@
  HAVE_D2M_TRUE = @HAVE_D2M_TRUE@
+ INPUTFILE = @INPUTFILE@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
***************
*** 126,130 ****
  man_MANS = lwatch.1
  EXTRA_DIST = lwatch.sgml conf.ent.in lwatch.1.in
! CLEANFILES = lwatch.1 conf.ent
  subdir = doc
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
--- 127,133 ----
  man_MANS = lwatch.1
  EXTRA_DIST = lwatch.sgml conf.ent.in lwatch.1.in
! CLEANFILES = lwatch.1 conf.ent lwatch.txt manpage.links manpage.refs
! 
! sed_prog = -e 's!@CONFDIR\@!$(sysconfdir)!g' -e 's!@BINDIR\@!$(bindir)!g' -e 's!@INPUTFILE\@!$(INPUTFILE)!g'
  subdir = doc
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
***************
*** 319,326 ****
  
  @HAVE_D2M_TRUE@lwatch.1: lwatch.sgml conf.ent.in
! @HAVE_D2M_TRUE@	$(SED) -e "s#@CONFDIR\@#$(sysconfdir)#g" -e "s#@BINDIR\@#$(bindir)#g" < conf.ent.in > conf.ent
  @HAVE_D2M_TRUE@	$(dbook2man) lwatch.sgml > lwatch.1
  @HAVE_D2M_FALSE@lwatch.1: lwatch.1.in Makefile
! @HAVE_D2M_FALSE@	$(SED) -e "s#@CONFDIR\@#$(sysconfdir)#g" -e "s#@BINDIR\@#$(bindir)#g" < lwatch.1.in > lwatch.1
  
  lwatch.1.in: lwatch.sgml conf.ent.in
--- 322,329 ----
  
  @HAVE_D2M_TRUE@lwatch.1: lwatch.sgml conf.ent.in
! @HAVE_D2M_TRUE@	$(SED) $(sed_prog) < conf.ent.in > conf.ent
  @HAVE_D2M_TRUE@	$(dbook2man) lwatch.sgml > lwatch.1
  @HAVE_D2M_FALSE@lwatch.1: lwatch.1.in Makefile
! @HAVE_D2M_FALSE@	$(SED) $(sed_prog) < lwatch.1.in > lwatch.1
  
  lwatch.1.in: lwatch.sgml conf.ent.in

Index: conf.ent.in
===================================================================
RCS file: /cvsroot/lwatch/files/doc/conf.ent.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** conf.ent.in	17 Mar 2003 16:58:00 -0000	1.4
--- conf.ent.in	24 Mar 2003 13:43:21 -0000	1.5
***************
*** 29,30 ****
--- 29,31 ----
  <!ENTITY conf "@CONFDIR@/lwatch.conf">
  <!ENTITY bin "@BINDIR@/lwatch">
+ <!ENTITY infile "@INPUTFILE@">

Index: lwatch.1.in
===================================================================
RCS file: /cvsroot/lwatch/files/doc/lwatch.1.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** lwatch.1.in	24 Mar 2003 12:04:24 -0000	1.7
--- lwatch.1.in	24 Mar 2003 13:43:21 -0000	1.8
***************
*** 70,74 ****
  \fB-C\fP 
  .PP 
! The way it works is simple. It reads a line from input, splits it 
  into four parts: date, hostname, service name (with PID, if available) 
  and real message. Each part has its own default color. You can redefine 
--- 70,74 ----
  \fB-C\fP 
  .PP 
! The way it works is simple. It reads a line from input (build-in default is @INPUTFILE@), splits it 
  into four parts: date, hostname, service name (with PID, if available) 
  and real message. Each part has its own default color. You can redefine 
***************
*** 94,98 ****
  .IP "\fB-f \fIfilename\fP\fP" 10 
  .IP "\fB--fifo \fIfilename\fP\fP" 10 
! read data from named fifo filename instead of /tmp/test 
  .IP "\fB-s\fP" 10 
  .IP "\fB--show-unparsed\fP" 10 
--- 94,98 ----
  .IP "\fB-f \fIfilename\fP\fP" 10 
  .IP "\fB--fifo \fIfilename\fP\fP" 10 
! read data from named fifo filename instead of @INPUTFILE@ 
  .IP "\fB-s\fP" 10 
  .IP "\fB--show-unparsed\fP" 10 
***************
*** 114,118 ****
  .nf 
  .ta 8n 16n 24n 32n 40n 48n 56n 64n 72n 
! *.*                                        |/tmp/your_fifo 
   
  .fi 
--- 114,118 ----
  .nf 
  .ta 8n 16n 24n 32n 40n 48n 56n 64n 72n 
! *.*                                        |@INPUTFILE@ 
   
  .fi 
***************
*** 144,146 ****
  option) any later version. 
   
! ...\" created by instant / docbook-to-man, Mon 24 Mar 2003, 13:03 
--- 144,146 ----
  option) any later version. 
   
! ...\" created by instant / docbook-to-man, Mon 24 Mar 2003, 14:40 

Index: lwatch.sgml
===================================================================
RCS file: /cvsroot/lwatch/files/doc/lwatch.sgml,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** lwatch.sgml	24 Mar 2003 12:04:25 -0000	1.12
--- lwatch.sgml	24 Mar 2003 13:43:21 -0000	1.13
***************
*** 76,80 ****
      <option>-C</option></para>
  
!     <para>The way it works is simple. It reads a line from input, splits it
        into four parts: date, hostname, service name (with PID, if available)
        and real message. Each part has its own default color. You can redefine
--- 76,80 ----
      <option>-C</option></para>
  
!     <para>The way it works is simple. It reads a line from input (build-in default is &infile;), splits it
        into four parts: date, hostname, service name (with PID, if available)
        and real message. Each part has its own default color. You can redefine
***************
*** 110,114 ****
  	  <term><option>--fifo <replaceable>filename</replaceable></option></term>
  	  <listitem>
! 	    <para>read data from named fifo filename instead of /tmp/test</para>
  	  </listitem>
          </varlistentry>
--- 110,114 ----
  	  <term><option>--fifo <replaceable>filename</replaceable></option></term>
  	  <listitem>
! 	    <para>read data from named fifo filename instead of &infile;</para>
  	  </listitem>
          </varlistentry>
***************
*** 151,155 ****
      To do it, put a line:
      <literallayout>
!     *.*                                        |/tmp/your_fifo
      </literallayout>
      in your syslog.conf. Create appropriate fifo and restart syslog, then run
--- 151,155 ----
      To do it, put a line:
      <literallayout>
!     *.*                                        |&infile;
      </literallayout>
      in your syslog.conf. Create appropriate fifo and restart syslog, then run