summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2013-08-03 09:45:36 -0700
committerStefano Karapetsas <[email protected]>2013-08-03 09:45:36 -0700
commitf46847b158fb717ab39f8909f4856d39fdc56837 (patch)
tree022a072cb1c1797881e728b9b60eb0fb74d5500e
parent1e8678642d984fc205fd803fffe915417802139f (diff)
parent7f7eeccf65d7f7f69ff78e2444d454cfdf765af8 (diff)
downloadmarco-f46847b158fb717ab39f8909f4856d39fdc56837.tar.bz2
marco-f46847b158fb717ab39f8909f4856d39fdc56837.tar.xz
Merge pull request #55 from infirit/yelptools
Use yelp-tools instead of mate-doc-utils
-rwxr-xr-xautogen.sh5
-rw-r--r--configure.ac4
-rw-r--r--doc/creating_themes/C/index.docbook (renamed from doc/creating_themes/C/creating-marco-themes.xml)0
-rw-r--r--doc/creating_themes/Makefile.am16
4 files changed, 13 insertions, 12 deletions
diff --git a/autogen.sh b/autogen.sh
index 93f6f966..d79eaca6 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -17,6 +17,11 @@ which mate-autogen || {
exit 1
}
+which yelp-build || {
+ echo "You need to install yelp-tools"
+ exit 1
+}
+
REQUIRED_AUTOMAKE_VERSION=1.9
USE_MATE2_MACROS=1
USE_COMMON_DOC_BUILD=yes
diff --git a/configure.ac b/configure.ac
index 7e7b3863..5b6ef735 100644
--- a/configure.ac
+++ b/configure.ac
@@ -508,8 +508,8 @@ if test "x$GCC" = "xyes"; then
fi
fi
-# Use mate-doc-utils:
-MATE_DOC_INIT([0.8.0])
+# Use yelp-tools:
+YELP_HELP_INIT
AC_CONFIG_FILES([
Makefile
diff --git a/doc/creating_themes/C/creating-marco-themes.xml b/doc/creating_themes/C/index.docbook
index a2b6da7c..a2b6da7c 100644
--- a/doc/creating_themes/C/creating-marco-themes.xml
+++ b/doc/creating_themes/C/index.docbook
diff --git a/doc/creating_themes/Makefile.am b/doc/creating_themes/Makefile.am
index b848256c..7d567745 100644
--- a/doc/creating_themes/Makefile.am
+++ b/doc/creating_themes/Makefile.am
@@ -1,24 +1,20 @@
### This part of Makefile.am can be customized by you.
-# mate-doc-utils standard variables:
-include $(top_srcdir)/mate-doc-utils.make
-dist-hook: doc-dist-hook
+# yelp-tools:
+@YELP_HELP_RULES@
# The name of the directory in /usr/share/mate/help/,
# and the name of the main .xml file:
-DOC_MODULE = creating-marco-themes
+HELP_ID = creating-marco-themes
# The names of any files included via entity declarations.
-DOC_ENTITIES =
-
-# The names of any files included by xincluded (preferred):
-DOC_INCLUDES =
+HELP_FILES = index.docbook
# The names of any pictures:
-DOC_FIGURES =
+HELP_MEDIA =
# The names of any locales for which documentation translations exist:
-DOC_LINGUAS =
+HELP_LINGUAS =