[gnome-keyring] Revert "Revert "Add docs/ directory back into Makefile""

[Stefan Walter <stefw src gnome org>]

commit 1fdc7a48650cedc15921a878fae557f9aa4e6c08
Author: Stef Walter <stefw gnome org>
Date:   Tue May 13 21:12:51 2014 +0200

    Revert "Revert "Add docs/ directory back into Makefile""
    
    This reverts commit b324fe2d976512b7705beca57ff9a62630cc6c83.

 Makefile.am      |    1 +
 docs/Makefile.am |   34 +++++++++++++++++++---------------
 2 files changed, 20 insertions(+), 15 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 45a8bf0..9f6bd2f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -194,6 +194,7 @@ EXTRA_DIST = \
        $(VALGRIND_SUPPRESSIONS) \
        $(NULL)
 
+include docs/Makefile.am
 include egg/Makefile.am
 include daemon/Makefile.am
 include daemon/control/Makefile.am
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 75e9bbf..e921560 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,17 +1,20 @@
 
 generated_mans = \
-       gnome-keyring-daemon.1 \
-       gnome-keyring.1 \
+       docs/gnome-keyring-daemon.1 \
+       docs/gnome-keyring.1 \
        $(NULL)
 
-man1_MANS = $(generated_mans) \
-       gnome-keyring-3.1 \
+man1_MANS = \
+       $(generated_mans) \
+       docs/gnome-keyring-3.1 \
        $(NULL)
 
 MAN_IN_FILES = \
-       $(generated_mans:.1=.xml)
+       docs/gnome-keyring-daemon.xml \
+       docs/gnome-keyring.xml \
+       $(NULL)
 
-CLEANFILES = \
+CLEANFILES += \
        $(generated_mans)
 
 XSLTPROC_FLAGS = \
@@ -22,16 +25,17 @@ XSLTPROC_FLAGS = \
        --stringparam man.authors.section.enabled 0 \
        --stringparam man.copyright.section.enabled 0
 
-XSLTPROC_MAN = \
-       $(XSLTPROC) $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl
+XSLTPROC_XSL = \
+       http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl
 
 .xml.1:
-       $(AM_V_GEN) $(XSLTPROC_MAN) $<
-
-EXTRA_DIST = \
-       file-format.txt \
-       keyring-intro.txt \
-       gnome-keyring.svg \
+       $(AM_V_GEN) $(XSLTPROC) $(XSLTPROC_MAN) $(XSLTPROC_FLAGS) \
+               --output $@ $(XSLTPROC_XSL) $<
+
+EXTRA_DIST += \
+       docs/file-format.txt \
+       docs/keyring-intro.txt \
+       docs/gnome-keyring.svg \
+       docs/gnome-keyring-3.1 \
        $(MAN_IN_FILES) \
-       gnome-keyring-3.1 \
        $(NULL)