diff options
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rwxr-xr-x | autogen.sh | 7 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | help/C/index.docbook (renamed from help/C/mate-sensors-applet.xml) | 6 | ||||
| -rw-r--r-- | help/C/legal.xml | 2 | ||||
| -rw-r--r-- | help/Makefile.am | 12 |
6 files changed, 18 insertions, 16 deletions
diff --git a/Makefile.am b/Makefile.am index 9fa1568..c94545d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -46,8 +46,7 @@ EXTRA_DIST = $(ui_DATA) \ $(service_in_files) \ $(gsettings_SCHEMAS_in_in) -DISTCLEANFILES = mate-doc-utils.make \ - intltool-extract \ +DISTCLEANFILES = intltool-extract \ intltool-merge \ intltool-update @@ -13,7 +13,12 @@ PKG_NAME="mate-sensors-applet" } which mate-autogen || { - echo "You need to install mate-common from the MATE Git" + echo "You need to install mate-common" + exit 1 +} + +which yelp-build || { + echo "You need to install yelp-tools" exit 1 } diff --git a/configure.ac b/configure.ac index a9fbc2a..4a0767e 100644 --- a/configure.ac +++ b/configure.ac @@ -247,8 +247,8 @@ fi MATE_COMPILE_WARNINGS(maximum) -# ================ mate-doc-utils stuff ============= # -MATE_DOC_INIT +# ================ yelp-tools stuff ============= # +YELP_HELP_INIT # ================ GSettings stuff ============= # GLIB_GSETTINGS diff --git a/help/C/mate-sensors-applet.xml b/help/C/index.docbook index bf9bfc1..3ae140e 100644 --- a/help/C/mate-sensors-applet.xml +++ b/help/C/index.docbook @@ -556,7 +556,7 @@ Alarms for individual sensors must also be enabled. For more information regarding MateDialog please consult the MateDialog <ulink type="help" - url="ghelp:matedialog">documentation</ulink>. + url="help:matedialog">documentation</ulink>. </para> </listitem> </varlistentry> @@ -665,7 +665,7 @@ Alarms for individual sensors must also be enabled. </variablelist> <note> <para>These values can also be set using the <ulink type="help" - url="ghelp:mateconf-editor">Configuration Editor</ulink> + url="help:mateconf-editor">Configuration Editor</ulink> application. </para> </note> @@ -718,7 +718,7 @@ Alarms for individual sensors must also be enabled. Public license as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. A copy of this license can be found at this <ulink - type="help" url="ghelp:gpl">link</ulink>, or in the file COPYING + type="help" url="help:gpl">link</ulink>, or in the file COPYING included with the source code of this program. </para> </sect1> diff --git a/help/C/legal.xml b/help/C/legal.xml index acb0b40..9c4e248 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 MATE manuals diff --git a/help/Makefile.am b/help/Makefile.am index d6dac70..da9ec62 100644 --- a/help/Makefile.am +++ b/help/Makefile.am @@ -1,8 +1,6 @@ -include $(top_srcdir)/mate-doc-utils.make -dist-hook: doc-dist-hook +@YELP_HELP_RULES@ -DOC_MODULE = mate-sensors-applet -DOC_ENTITIES = legal.xml -DOC_FIGURES = figures/applet_in_panel.png -DOC_INCLUDES = -DOC_LINGUAS = +HELP_ID = mate-sensors-applet +HELP_FILES = index.docbook legal.xml +HELP_MEDIA = figures/applet_in_panel.png +HELP_LINGUAS = |