[gtkmm-documentation] Install files into ${datadir}/doc/gtkmm-2.4

[Daniel Elstner <daniel src gnome org>]

commit e9ec9163a2b53f2f79ccfdec935acec23ec8c854
Author: Daniel Elstner <danielk openismus com>
Date:   Mon Sep 7 12:58:21 2009 +0200

    Install files into ${datadir}/doc/gtkmm-2.4
    
    * docs/{FAQ,tutorial}/Makefile.am: Remove include statement for
    Makefile_web.am_fragment.
    (gtkmm_docdir): Set to $(datadir)/doc/gtkmm-2.4, without the /docs
    suffix, in order to match the new installation location of the
    reference documentation.
    * docs/Makefile_web.am_fragment: Delete obsolete file.

 ChangeLog                     |   11 +++++++++++
 docs/FAQ/Makefile.am          |   10 +++++-----
 docs/Makefile_web.am_fragment |   17 -----------------
 docs/tutorial/Makefile.am     |    4 ++--
 4 files changed, 18 insertions(+), 24 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 3f3bb5d..f68b302 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2009-09-07  Daniel Elstner  <danielk openismus com>
 
+	Install files into ${datadir}/doc/gtkmm-2.4
+
+	* docs/{FAQ,tutorial}/Makefile.am: Remove include statement for
+	Makefile_web.am_fragment.
+	(gtkmm_docdir): Set to $(datadir)/doc/gtkmm-2.4, without the /docs
+	suffix, in order to match the new installation location of the
+	reference documentation.
+	* docs/Makefile_web.am_fragment: Delete obsolete file.
+
+2009-09-07  Daniel Elstner  <danielk openismus com>
+
 	Update the new bindings chapter for mm-common
 
 	* docs/tutorial/C/gtkmm-tut.xml: Update the chapter on the creation
diff --git a/docs/FAQ/Makefile.am b/docs/FAQ/Makefile.am
index 58d31fd..c0fdb41 100644
--- a/docs/FAQ/Makefile.am
+++ b/docs/FAQ/Makefile.am
@@ -1,7 +1,7 @@
-docbook_docs = gtkmm-faq.xml
+## This file is part of gtkmm-documentation.
 
-include $(top_srcdir)/docs/Makefile_web.am_fragment
-gtkmm_faq_path  = $(web_path_docs)FAQ
+gtkmm_docdir = $(datadir)/doc/gtkmm-2.4
+docbook_docs = gtkmm-faq.xml
 
 EXTRA_DIST = README gtkmm-faq.xml html
 
@@ -13,8 +13,8 @@ html/index.html: $(docbook_docs)
 	$(mkinstalldirs) html
 	xsltproc -o html/ --catalogs $(DOCBOOK_STYLESHEET) $<
 
-post-html: html/index.html
-	rsync $(rsync_args) -r html $$USER $(web_host):$(gtkmm_faq_path)/
+#post-html: html/index.html
+#	rsync $(rsync_args) -r html $$USER $(web_host):$(gtkmm_faq_path)/
 
 doc-clean:
 	-rm -rf html
diff --git a/docs/tutorial/Makefile.am b/docs/tutorial/Makefile.am
index 7224a21..f267d82 100644
--- a/docs/tutorial/Makefile.am
+++ b/docs/tutorial/Makefile.am
@@ -1,6 +1,6 @@
-include $(top_srcdir)/docs/Makefile_web.am_fragment
+## This file is part of gtkmm-documentation.
 
-gtkmm_tut_path = $(web_path_docs)tutorial
+gtkmm_docdir = $(datadir)/doc/gtkmm-2.4
 
 DOCBOOK_PHPWEBNOTES_TRANSFORM = docbook_phpwebnotes.xsl