Change documentation host to library.gnome.org

* docs/Makefile.am (htmlrefpub): Remove override and use the
updated mm-common default value.
* docs/reference/glibmm_header.html_fragment: Adjust links to
the main page and the gtkmm book.
* {glib,gio}/{glib,gio}mm{,-uninstalled}.pc.in (htmlrefpub):
Adjust variable values.
* configure.ac (MM_PREREQ): Require mm-common 0.6.1.

8 files changed, 19 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index d7414f96..b87235a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2009-08-25  Daniel Elstner  <danielk@openismus.com>
+
+	Change documentation host to library.gnome.org
+
+	* docs/Makefile.am (htmlrefpub): Remove override and use the
+	updated mm-common default value.
+	* docs/reference/glibmm_header.html_fragment: Adjust links to
+	the main page and the gtkmm book.
+	* {glib,gio}/{glib,gio}mm{,-uninstalled}.pc.in (htmlrefpub):
+	Adjust variable values.
+	* configure.ac (MM_PREREQ): Require mm-common 0.6.1.
+
 2009-08-24  Daniel Elstner  <danielk@openismus.com>
 
 	Strip directory from filenames in enum.pl output
diff --git a/configure.ac b/configure.ac
index de71df0f..71d7fee1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,7 @@ AM_INIT_AUTOMAKE([1.9 -Wno-portability dist-bzip2 no-define nostdinc tar-pax])
 AM_MAINTAINER_MODE
 AC_ARG_VAR([ACLOCAL_FLAGS], [aclocal flags, e.g. -I <macro dir>])
 
-MM_PREREQ([0.6])
+MM_PREREQ([0.6.1])
 MM_INIT_MODULE([glibmm-2.4])
 MM_INIT_MODULE([giomm-2.4])
 MM_CONFIG_DOCTOOL_DIR([docs])
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 54a289df..9a424e4e 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -27,10 +27,6 @@ book_name = $(GLIBMM_MODULE_NAME)
 doc_input = $(addprefix $(top_srcdir)/glib/glibmm/,$(glibmm_files_h)) \
             $(addprefix $(top_srcdir)/gio/giomm/,$(giomm_files_h))
 
-# Override the web location to use the old-style path with redundant
-# directory components.
-htmlrefpub = http://www.gtkmm.org/docs/$(book_name)/docs/reference/html/
-
 doctooldir = $(datadir)/$(GLIBMM_MODULE_NAME)/doctool
 dist_doctool_DATA = doc-install.pl doc-postprocess.pl tagfile-to-devhelp2.xsl
 
diff --git a/docs/reference/glibmm_header.html_fragment b/docs/reference/glibmm_header.html_fragment
index 2c549c7f..1fb9c08b 100644
--- a/docs/reference/glibmm_header.html_fragment
+++ b/docs/reference/glibmm_header.html_fragment
@@ -11,9 +11,9 @@
 </tr>
 </table>
 <center>
-  <a class="qindex" href="http://www.gtkmm.org/documentation.shtml">Main Page</a> &nbsp;
+  <a class="qindex" href="http://library.gnome.org/devel/">Main Page</a> &nbsp;
   <a class="qindex" href="namespaces.html">glibmm Namespaces</a> &nbsp;
-  <a href="../../../../gtkmm-2.4/docs/tutorial/html/index.html"> Book</a> &nbsp;
+  <a href="http://www.gtkmm.org/docs/gtkmm-2.4/docs/tutorial/html/index.html">Book</a> &nbsp;
 </center>
 <hr width="100%"/>
 
diff --git a/gio/giomm-uninstalled.pc.in b/gio/giomm-uninstalled.pc.in
index 5e7ce338..a72da5b9 100644
--- a/gio/giomm-uninstalled.pc.in
+++ b/gio/giomm-uninstalled.pc.in
@@ -1,5 +1,5 @@
 doxytagfile=${pc_top_builddir}/docs/reference/@GLIBMM_MODULE_NAME@.tag
-htmlrefpub=http://www.gtkmm.org/docs/@GLIBMM_MODULE_NAME@/docs/reference/html/
+htmlrefpub=http://library.gnome.org/devel/@PACKAGE_TARNAME@/unstable/
 
 Name: giomm
 Description: C++ binding for gio, not installed
diff --git a/gio/giomm.pc.in b/gio/giomm.pc.in
index 5efeab52..2ec76a72 100644
--- a/gio/giomm.pc.in
+++ b/gio/giomm.pc.in
@@ -8,7 +8,7 @@ includedir=@includedir@
 docdir=${datarootdir}/doc/@GLIBMM_MODULE_NAME@
 doxytagfile=${docdir}/reference/@GLIBMM_MODULE_NAME@.tag
 htmlrefdir=${docdir}/reference/html
-htmlrefpub=http://www.gtkmm.org/docs/@GLIBMM_MODULE_NAME@/docs/reference/html/
+htmlrefpub=http://library.gnome.org/devel/@PACKAGE_TARNAME@/unstable/
 
 Name: giomm
 Description: C++ binding for gio
diff --git a/glib/glibmm-uninstalled.pc.in b/glib/glibmm-uninstalled.pc.in
index 2d61c292..1a1f7810 100644
--- a/glib/glibmm-uninstalled.pc.in
+++ b/glib/glibmm-uninstalled.pc.in
@@ -2,7 +2,7 @@ gmmprocdir=${pc_top_builddir}/tools
 doctooldir=${pc_top_builddir}/${pcfiledir}/@top_srcdir@/docs
 
 doxytagfile=${pc_top_builddir}/docs/reference/@GLIBMM_MODULE_NAME@.tag
-htmlrefpub=http://www.gtkmm.org/docs/@GLIBMM_MODULE_NAME@/docs/reference/html/
+htmlrefpub=http://library.gnome.org/devel/@PACKAGE_TARNAME@/unstable/
 
 Name: glibmm
 Description: C++ binding for GLib, not installed
diff --git a/glib/glibmm.pc.in b/glib/glibmm.pc.in
index b9a4e49c..45cfbf78 100644
--- a/glib/glibmm.pc.in
+++ b/glib/glibmm.pc.in
@@ -11,7 +11,7 @@ doctooldir=${datadir}/@GLIBMM_MODULE_NAME@/doctool
 docdir=${datarootdir}/doc/@GLIBMM_MODULE_NAME@
 doxytagfile=${docdir}/reference/@GLIBMM_MODULE_NAME@.tag
 htmlrefdir=${docdir}/reference/html
-htmlrefpub=http://www.gtkmm.org/docs/@GLIBMM_MODULE_NAME@/docs/reference/html/
+htmlrefpub=http://library.gnome.org/devel/@PACKAGE_TARNAME@/unstable/
 
 Name: glibmm
 Description: C++ wrapper for GLib