[goobox] ported to the new documentation infrastructure

[Paolo Bacchilega <paobac src gnome org>]

commit 7707854c0452d860afb3bb66785422437f867e30
Author: Paolo Bacchilega <paobac src gnome org>
Date:   Sun Jun 3 14:25:15 2012 +0200

    ported to the new documentation infrastructure

 Makefile.am      |    5 +----
 configure.ac     |    2 +-
 help/Makefile.am |   17 +++++++----------
 src/gtk-utils.c  |    2 +-
 4 files changed, 10 insertions(+), 16 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 495018e..5cca9cd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,12 +10,9 @@ EXTRA_DIST = 			\
 	add-include-prefix	\
 	intltool-merge.in	\
 	intltool-update.in	\
-	intltool-extract.in	\
-	gnome-doc-utils.make
-
+	intltool-extract.in
 
 DISTCLEANFILES =                        \
-	gnome-doc-utils.make		\
 	po/.intltool-merge-cache        \
 	intltool-extract                \
 	intltool-merge                  \
diff --git a/configure.ac b/configure.ac
index 7f72aec..fa09cb8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,7 +10,7 @@ AC_CONFIG_MACRO_DIR([m4])
 GNOME_COMMON_INIT
 AC_PROG_CXX
 AM_PROG_LIBTOOL
-GNOME_DOC_INIT
+YELP_HELP_INIT
 GNOME_COMPILE_WARNINGS([maximum])
 GNOME_MAINTAINER_MODE_DEFINES
 GLIB_GSETTINGS
diff --git a/help/Makefile.am b/help/Makefile.am
index e7a42ac..708914b 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,14 +1,11 @@
-include $(top_srcdir)/gnome-doc-utils.make
-dist-hook: doc-dist-hook
+ YELP_HELP_RULES@
 
-DOC_ID = goobox
-DOC_INCLUDES = legal.xml
-
-DOC_PAGES = \
-	index.page \
-	preferences.page \
+HELP_ID = goobox
+HELP_FILES = 			\
+	index.page		\
+	legal.xml		\
+	preferences.page	\
 	shortcuts.page
-
-DOC_LINGUAS = ca cs de es fr oc sl sv
+HELP_LINGUAS = ca cs de es fr oc sl sv
 
 -include $(top_srcdir)/git.mk
diff --git a/src/gtk-utils.c b/src/gtk-utils.c
index a2954e1..6ee3286 100644
--- a/src/gtk-utils.c
+++ b/src/gtk-utils.c
@@ -744,7 +744,7 @@ show_help_dialog (GtkWindow  *parent,
 	char   *uri;
 	GError *error = NULL;
 
-	uri = g_strconcat ("ghelp:goobox", ((section != NULL) ? "?" : "?index"), section, NULL);
+	uri = g_strconcat ("help:goobox", section ? "?" : NULL, section, NULL);
 	if (! gtk_show_uri (gtk_window_get_screen (parent), uri, GDK_CURRENT_TIME, &error)) {
   		GtkWidget *dialog;