[aisleriot] Build ghelp with yelp-tools instead of gnome-doc-utils

[Jeremy Bicha <jbicha src gnome org>]

commit 214e745f315451074fd19031621e7a088ce7598c
Author: Jeremy Bicha <jbicha ubuntu com>
Date:   Tue Aug 30 05:22:49 2011 -0400

    Build ghelp with yelp-tools instead of gnome-doc-utils
    
    yelp-tools is a replacement for gnome-doc-utils. Help is stored in
    share/help instead of share/gnome/help and links use help:aisleriot
    instead of ghelp:aisleriot
    
    https://bugzilla.gnome.org/show_bug.cgi?id=657683

 Makefile.am       |    3 ---
 autogen.sh        |    2 +-
 configure.ac      |    8 ++++----
 help/Makefile.am  |   14 +++++---------
 src/lib/ar-help.c |    4 ++--
 5 files changed, 12 insertions(+), 19 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 556b1b3..ef93ffe 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,7 +24,6 @@ EXTRA_DIST = \
 	COPYING-DOCS \
 	COPYING.GPL3 \
 	COPYING.LGPL3 \
-	gnome-doc-utils.make \
 	ChangeLog \
 	$(NULL)
 
@@ -32,7 +31,6 @@ DISTCLEANFILES = \
 	intltool-extract \
 	intltool-merge \
 	intltool-update \
-	gnome-doc-utils.make \
 	$(NULL)
 
 MAINTAINERCLEANFILES = \
@@ -52,7 +50,6 @@ MAINTAINERCLEANFILES = \
 	$(srcdir)/ltmain.sh \
 	$(srcdir)/missing \
 	$(srcdir)/mkinstalldirs \
-	$(srcdir)/gtk-doc.make \
 	$(srcdir)/po/Makefile.in.in \
 	`find "$(srcdir)" -type f -name Makefile.in -print` \
 	$(NULL)
diff --git a/autogen.sh b/autogen.sh
index b7c0458..1b5cdbc 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -19,7 +19,7 @@ which gnome-autogen.sh || {
 }
 
 REQUIRED_AUTOMAKE_VERSION=1.9 
-REQUIRED_GNOME_DOC_UTILS_VERSION=0.10.0 
+REQUIRED_YELP_TOOLS_VERSION=3.1.1
 REQUIRED_GETTEXT_VERSION=0.12
 REQUIRED_INTLTOOL_VERSION=0.40.4
 
diff --git a/configure.ac b/configure.ac
index 1899b82..7b30bdb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -593,11 +593,11 @@ if test "$with_help_method" = "file"; then
   AC_DEFINE_UNQUOTED([HELP_FILE_FORMAT],["$with_help_file_format"],[The help file format])
 fi
 
-GNOME_DOC_INIT([0.10.0],
-  [have_gdu=yes],
-  [have_gdu=no
+YELP_HELP_INIT([3.1.1],
+  [have_yelptools=yes],
+  [have_yelptools=no
    if test "$with_help_method" = "ghelp"; then
-     AC_MSG_ERROR([ghelp requested, but gnome-doc-utils not found!])
+     AC_MSG_ERROR([ghelp requested, but yelp-tools not found!])
    fi])
 
 AM_CONDITIONAL([BUILD_HELP],[test "$with_help_method" = "ghelp"])
diff --git a/help/Makefile.am b/help/Makefile.am
index 79076b3..f7af933 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,12 +1,10 @@
-include $(top_srcdir)/gnome-doc-utils.make
+ YELP_HELP_RULES@
 
-NULL =
+HELP_LINGUAS = ca de el en_GB es eu fr oc ru sl sr sr latin sv zh_CN
 
-DOC_LINGUAS = ca de el en_GB es eu fr oc ru sl sr sr latin sv zh_CN
+HELP_ID = aisleriot
 
-DOC_MODULE = aisleriot
-
-DOC_ENTITIES = \
+HELP_FILES = \
 	accordion.xml \
 	agnes.xml \
 	athena.xml \
@@ -99,13 +97,11 @@ DOC_ENTITIES = \
 	zebra.xml \
 	$(NULL)
 
-DOC_FIGURES = \
+HELP_MEDIA = \
 	figures/camelot-goal.png \
   	figures/clock-rules.png \
 	$(NULL)
 
-dist-hook: doc-dist-hook
-
 dist_man_MANS = sol.6
 
 -include $(top_srcdir)/git.mk
diff --git a/src/lib/ar-help.c b/src/lib/ar-help.c
index deb53e1..1346c2e 100644
--- a/src/lib/ar-help.c
+++ b/src/lib/ar-help.c
@@ -61,10 +61,10 @@ ar_help_display_full (GtkWidget *window,
     char *escaped_section;
 
     escaped_section = g_uri_escape_string  (section, NULL, TRUE);
-    help_uri = g_strdup_printf ("ghelp:%s?%s", doc_module, escaped_section);
+    help_uri = g_strdup_printf ("help:%s?%s", doc_module, escaped_section);
     g_free (escaped_section);
   } else {
-    help_uri = g_strdup_printf ("ghelp:%s", doc_module);
+    help_uri = g_strdup_printf ("help:%s", doc_module);
   }
 #elif defined(WITH_HELP_METHOD_FILE)
   const char *help_dir;