Relevant BUGIDs: none

Purpose of commit: bugfix/cleanup

Commit summary:
---------------

Instead of duplicating the xml rules for every directory again,
include them from the top level one.

2006-01-30  Thorsten Kukuk  <kukuk@thkukuk.de>

        * modules/pam_exec/pam_exec.8.xml: Fix syntax of Return Value section.
        * modules/pam_exec/Makefile.am: Include Make.xml.rules.

        * Make.xml.rules: New.

diff --git a/ChangeLog b/ChangeLog
index 1761ff7b05dc4678262af7eb33f8d18a6f14430f..f7f1f49b274dcf35417916a48d225b0adec8972e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-01-30  Thorsten Kukuk  <kukuk@thkukuk.de>
+
+       * modules/pam_exec/pam_exec.8.xml: Fix syntax of Return Value section.
+       * modules/pam_exec/Makefile.am: Include Make.xml.rules.
+
+       * Make.xml.rules: New.
+
 2006-01-27  Thorsten Kukuk  <kukuk@thkukuk.de>
 
        * configure.in: Prefer libdb over libndbm, fix check for

diff --git a/Make.xml.rules b/Make.xml.rules
new file mode 100644 (file)
index 0000000..f6512aa
--- /dev/null
+++ b/Make.xml.rules
@@ -0,0 +1,22 @@
+#
+# Copyright (c) 2006 Thorsten Kukuk <kukuk@thkukuk.de>
+#
+
+%.1: %.1.xml
+       $(XMLLINT) --nonet --xinclude --postvalid --noout $<
+       $(XSLTPROC) --nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
+
+%.3: %.3.xml
+       $(XMLLINT) --nonet --xinclude --postvalid --noout $<
+       $(XSLTPROC) --nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
+
+%.5: %.5.xml
+       $(XMLLINT) --nonet --xinclude --postvalid --noout $<
+       $(XSLTPROC) --nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
+
+%.8: %.8.xml
+       $(XMLLINT) --nonet --xinclude --postvalid --noout $<
+       $(XSLTPROC) --nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
+
+#CLEANFILES += $(man_MANS)
+

diff --git a/modules/pam_exec/Makefile.am b/modules/pam_exec/Makefile.am
index e67013d101ed7c1b421ad9953e6cfcea4d28cbfd..e7ecd59195b1c54ab24b93c799fdbfd2ddcad952 100644 (file)
--- a/modules/pam_exec/Makefile.am
+++ b/modules/pam_exec/Makefile.am
@@ -22,12 +22,6 @@ endif
 securelib_LTLIBRARIES = pam_exec.la
 
 if ENABLE_REGENERATE_MAN
-
-pam_exec.8: pam_exec.8.xml
-       $(XMLLINT) --nonet --xinclude --postvalid --noout $<
-       $(XSLTPROC) --nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
-
-#CLEANFILES += $(man_MANS)
-
+-include $(top_srcdir)/Make.xml.rules
 endif
 

diff --git a/modules/pam_exec/pam_exec.8 b/modules/pam_exec/pam_exec.8
index 6ecd2dc994b54ac7b073e860c5241ddc0b44c5bf..96761ac65fc7145b647e3112b0b683e1598cc7e7 100644 (file)
--- a/modules/pam_exec/pam_exec.8
+++ b/modules/pam_exec/pam_exec.8
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "PAM_EXEC" "8" "01/24/2006" "Linux\-PAM Manual" "Linux\-PAM Manual"
+.TH "PAM_EXEC" "8" "01/30/2006" "Linux\-PAM Manual" "Linux\-PAM Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -39,16 +39,16 @@ are supported.
 .SH "RETURN VALUES"
 .PP
 .TP
-\fBPAM_SUCCESS\fR
+PAM_SUCCESS
 The external command runs successfull.
 .TP
-\fBPAM_SERVICE_ERR\fR
+PAM_SERVICE_ERR
 No argument or a wrong number of arguments were given.
 .TP
-\fBPAM_SYSTEM_ERR\fR
+PAM_SYSTEM_ERR
 A system error occured or the command to execute failed.
 .TP
-\fBPAM_IGNORE\fR
+PAM_IGNORE
 \fBpam_setcred\fR
 was called, which does not execute the command.
 .SH "EXAMPLES"

diff --git a/modules/pam_exec/pam_exec.8.xml b/modules/pam_exec/pam_exec.8.xml
index 112f76cdf27bde1b81a6bb9f84d901cd7ee4ac82..3b681cf26aa914473a2b19b628b7327cd76ebc18 100644 (file)
--- a/modules/pam_exec/pam_exec.8.xml
+++ b/modules/pam_exec/pam_exec.8.xml
@@ -109,9 +109,7 @@
       <variablelist>
 
         <varlistentry>
-          <term>
-            <option>PAM_SUCCESS</option>
-          </term>
+          <term>PAM_SUCCESS</term>
           <listitem>
             <para>
               The external command runs successfull.
@@ -120,9 +118,7 @@
         </varlistentry>
 
         <varlistentry>
-          <term>
-            <option>PAM_SERVICE_ERR</option>
-          </term>
+          <term>PAM_SERVICE_ERR</term>
           <listitem>
             <para>
              No argument or a wrong number of arguments were given.
@@ -131,9 +127,7 @@
         </varlistentry>
 
         <varlistentry>
-          <term>
-            <option>PAM_SYSTEM_ERR</option>
-          </term>
+          <term>PAM_SYSTEM_ERR</term>
           <listitem>
             <para>
              A system error occured or the command to execute failed.
@@ -142,9 +136,7 @@
         </varlistentry>
 
         <varlistentry>
-          <term>
-            <option>PAM_IGNORE</option>
-          </term>
+          <term>PAM_IGNORE</term>
           <listitem>
             <para>
              <function>pam_setcred</function> was called, which
@@ -176,16 +168,13 @@
     <title>See Also</title>
     <para>
       <citerefentry>
-       <refentrytitle>pam.conf</refentrytitle>
-       <manvolnum>5</manvolnum>
+       <refentrytitle>pam.conf</refentrytitle><manvolnum>5</manvolnum>
       </citerefentry>,
       <citerefentry>
-       <refentrytitle>pam.d</refentrytitle>
-       <manvolnum>8</manvolnum>
+       <refentrytitle>pam.d</refentrytitle><manvolnum>8</manvolnum>
       </citerefentry>,
       <citerefentry>
-       <refentrytitle>pam</refentrytitle>
-       <manvolnum>8</manvolnum>
+       <refentrytitle>pam</refentrytitle><manvolnum>8</manvolnum>
       </citerefentry>
     </para>
   </refsect1>