diff options
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | help/C/legal.xml | 2 | ||||
| -rw-r--r-- | help/Makefile.am | 13 | ||||
| -rw-r--r-- | src/util.c | 2 |
5 files changed, 11 insertions, 14 deletions
diff --git a/Makefile.am b/Makefile.am index f488138a..1e51c3e6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,14 +13,12 @@ EXTRA_DIST = \ ChangeLog \ NEWS \ README \ - AUTHORS \ - gnome-doc-utils.make + AUTHORS DISTCLEANFILES = \ intltool-extract \ intltool-merge \ - intltool-update \ - gnome-doc-utils.make + intltool-update DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper diff --git a/configure.ac b/configure.ac index 17baa71f..993fdfa8 100644 --- a/configure.ac +++ b/configure.ac @@ -119,7 +119,7 @@ AM_GLIB_GNU_GETTEXT # ******************************* # User manual # ******************************* -GNOME_DOC_INIT +YELP_HELP_INIT # ******************************* diff --git a/help/C/legal.xml b/help/C/legal.xml index ac97e1de..899282c3 100644 --- a/help/C/legal.xml +++ b/help/C/legal.xml @@ -6,7 +6,7 @@ by the Free Software Foundation with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy of the GFDL at this <ulink type="help" - url="ghelp:fdl">link</ulink> or in the file COPYING-DOCS + url="help:fdl">link</ulink> or in the file COPYING-DOCS distributed with this manual. </para> <para> This manual is part of a collection of GNOME manuals diff --git a/help/Makefile.am b/help/Makefile.am index 473f7e24..eca0e998 100644 --- a/help/Makefile.am +++ b/help/Makefile.am @@ -1,10 +1,8 @@ -include $(top_srcdir)/gnome-doc-utils.make -dist-hook: doc-dist-hook +@YELP_HELP_RULES@ -DOC_ID = zenity -DOC_INCLUDES = legal.xml +HELP_ID = zenity -DOC_FIGURES = \ +HELP_MEDIA = \ figures/zenity-calendar-screenshot.png \ figures/zenity-colorselection-screenshot.png \ figures/zenity-entry-screenshot.png \ @@ -21,7 +19,8 @@ DOC_FIGURES = \ figures/zenity-text-screenshot.png \ figures/zenity-warning-screenshot.png -DOC_PAGES = \ +HELP_FILES = \ + legal.xml \ calendar.page \ color-selection.page \ entry.page \ @@ -42,4 +41,4 @@ DOC_PAGES = \ usage.page \ warning.page -DOC_LINGUAS = bg ca cs da de el en_GB es eu fi fr gl hu ja oc pt_BR ru sl sv uk zh_CN +HELP_LINGUAS = bg ca cs da de el en_GB es eu fi fr gl hu ja oc pt_BR ru sl sv uk zh_CN @@ -252,7 +252,7 @@ zenity_util_show_help (GError **error) if (tmp) { g_free (tmp); - g_spawn_command_line_async ("yelp ghelp:zenity", error); + g_spawn_command_line_async ("yelp help:zenity", error); } } |