[gedit] Use new documentation infraestructure
- From: Javier JardÃn <jjardon src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gedit] Use new documentation infraestructure
- Date: Tue, 7 Feb 2012 20:37:12 +0000 (UTC)
commit a9607074f4f61677f28cd186b1d817db2f3369d9
Author: Javier JardÃn <jjardon gnome org>
Date: Tue Feb 7 17:54:14 2012 +0100
Use new documentation infraestructure
Fixes https://bugzilla.gnome.org/show_bug.cgi?id=669587
Makefile.am | 1 -
configure.ac | 3 +--
gedit/gedit-app.c | 4 ++--
help/Makefile.am | 11 ++++-------
4 files changed, 7 insertions(+), 12 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 159550d..e520a8f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,7 +19,6 @@ EXTRA_DIST = \
gedit.doap \
xmldocs.make \
omf.make \
- gnome-doc-utils.make \
intltool-extract.in \
intltool-merge.in \
intltool-update.in
diff --git a/configure.ac b/configure.ac
index cf2b75b..79304bb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -428,8 +428,7 @@ AC_SUBST(GEDIT_PLUGINS_DATA_DIR)
GEDIT_PLUGINS_LIBS_DIR="$libdir/gedit/plugins"
AC_SUBST(GEDIT_PLUGINS_LIBS_DIR)
-GNOME_DOC_INIT([0.9.0],,
- [AC_MSG_WARN([[gnome-doc-utils not found: documentation will not be built.]])])
+YELP_HELP_INIT
# Introspection
GOBJECT_INTROSPECTION_CHECK([0.9.3])
diff --git a/gedit/gedit-app.c b/gedit/gedit-app.c
index 49a496c..6dd6d46 100644
--- a/gedit/gedit-app.c
+++ b/gedit/gedit-app.c
@@ -176,11 +176,11 @@ gedit_app_help_link_id_impl (GeditApp *app,
{
if (link_id)
{
- return g_strdup_printf ("ghelp:%s?%s", name, link_id);
+ return g_strdup_printf ("help:%s?%s", name, link_id);
}
else
{
- return g_strdup_printf ("ghelp:%s", name);
+ return g_strdup_printf ("help:%s", name);
}
}
diff --git a/help/Makefile.am b/help/Makefile.am
index 309b511..bd6819a 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,7 +1,7 @@
-include $(top_srcdir)/gnome-doc-utils.make
+ YELP_HELP_RULES@
-DOC_ID = gedit
-DOC_FIGURES = \
+HELP_ID = gedit
+HELP_MEDIA = \
figures/gedit-icon.png \
figures/gedit-new-external-tool.png \
figures/gedit-open-location.png \
@@ -10,7 +10,7 @@ DOC_FIGURES = \
figures/gedit-side-pane2.png \
figures/gedit-side-pane3.png
-DOC_PAGES = \
+HELP_FILES = \
gedit-change-color-scheme.page \
gedit-change-default-font.page \
gedit-close-file.page \
@@ -67,7 +67,4 @@ DOC_PAGES = \
gedit-view-open-files-in-sidepane.page \
index.page
-DOC_LINGUAS = ar bg ca cs da de el es eu fi fr gl hu it ja ko oc pt_BR ru sl sv th uk zh_CN zh_HK zh_TW
-dist-hook: doc-dist-hook
-
-include $(top_srcdir)/git.mk
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]