Replace mate-doc-utils with yelp-tools

9 files changed, 21 insertions, 27 deletions

diff --git a/Makefile.am b/Makefile.am
index 3283061..75f45f4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,8 +25,7 @@ EXTRA_DIST =			\
 	COPYING-DOCS		\
 	HACKING			\
 	MAINTAINERS		\
-	mate-version.xml.in.in  \
-	mate-doc-utils.make
+	mate-version.xml.in.in
 
 CLEANFILES = \
 	$(version_DATA)
@@ -44,7 +43,6 @@ MAINTAINERCLEANFILES = \
 	`find "$(srcdir)" -type f -name Makefile.in -print` \
 	$(srcdir)/configure \
 	$(srcdir)/gtk-doc.make \
-	$(srcdir)/m4/mate-doc-utils.m4 \
 	$(srcdir)/m4/gtk-doc.m4 \
 	$(srcdir)/m4/intltool.m4
 
diff --git a/autogen.sh b/autogen.sh
index bf0a710..2ccc532 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -13,7 +13,12 @@ PKG_NAME="mate-desktop"
 }
 
 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 9f6e694..387668a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -223,9 +223,9 @@ PKG_CHECK_MODULES(MATE_ABOUT, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED)
 AC_SUBST(MATE_ABOUT_CFLAGS)
 AC_SUBST(MATE_ABOUT_LIBS)
 
-dnl mate-doc-utils stuff
+dnl yelp-tools stuff
 
-MATE_DOC_INIT
+YELP_HELP_INIT
 
 dnl Language Support
 
diff --git a/desktop-docs/fdl/C/fdl.xml b/desktop-docs/fdl/C/index.docbook
index 483ed15..483ed15 100644
--- a/desktop-docs/fdl/C/fdl.xml
+++ b/desktop-docs/fdl/C/index.docbook
diff --git a/desktop-docs/fdl/Makefile.am b/desktop-docs/fdl/Makefile.am
index 759bc28..5afd918 100644
--- a/desktop-docs/fdl/Makefile.am
+++ b/desktop-docs/fdl/Makefile.am
@@ -1,10 +1,7 @@
-include $(top_srcdir)/mate-doc-utils.make
-dist-hook: doc-dist-hook
+@YELP_HELP_RULES@
 
-DOC_MODULE = fdl
-DOC_ENTITIES = 
-DOC_INCLUDES = 
-
-DOC_LINGUAS = ar ca el es eu fr hu ko oc pl sv uk vi de
+HELP_ID = fdl
+HELP_FILES = index.docbook
+HELP_LINGUAS = ar ca el es eu fr hu ko oc pl sv uk vi de
 
 -include $(top_srcdir)/git.mk
diff --git a/desktop-docs/gpl/C/gpl.xml b/desktop-docs/gpl/C/index.docbook
index 7589a13..7589a13 100644
--- a/desktop-docs/gpl/C/gpl.xml
+++ b/desktop-docs/gpl/C/index.docbook
diff --git a/desktop-docs/gpl/Makefile.am b/desktop-docs/gpl/Makefile.am
index aaee3b9..b887e17 100644
--- a/desktop-docs/gpl/Makefile.am
+++ b/desktop-docs/gpl/Makefile.am
@@ -1,10 +1,7 @@
-include $(top_srcdir)/mate-doc-utils.make
-dist-hook: doc-dist-hook
+@YELP_HELP_RULES@
 
-DOC_MODULE = gpl
-DOC_ENTITIES = 
-DOC_INCLUDES = 
-
-DOC_LINGUAS = ar ca cs el es eu fi fr hu ko nds oc pa uk vi zh_CN sv de
+HELP_ID = gpl
+HELP_FILES = index.docbook
+HELP_LINGUAS = ar ca cs el es eu fi fr hu ko nds oc pa uk vi zh_CN sv de
 
 -include $(top_srcdir)/git.mk
diff --git a/desktop-docs/lgpl/C/lgpl.xml b/desktop-docs/lgpl/C/index.docbook
index dd7fa32..dd7fa32 100644
--- a/desktop-docs/lgpl/C/lgpl.xml
+++ b/desktop-docs/lgpl/C/index.docbook
diff --git a/desktop-docs/lgpl/Makefile.am b/desktop-docs/lgpl/Makefile.am
index a63c0be..3db96db 100644
--- a/desktop-docs/lgpl/Makefile.am
+++ b/desktop-docs/lgpl/Makefile.am
@@ -1,10 +1,7 @@
-include $(top_srcdir)/mate-doc-utils.make
-dist-hook: doc-dist-hook
+@YELP_HELP_RULES@
 
-DOC_MODULE = lgpl
-DOC_ENTITIES = 
-DOC_INCLUDES = 
-
-DOC_LINGUAS = ar de el es eu fi fr hu ko oc pa sv uk vi zh_CN
+HELP_ID = lgpl
+HELP_FILES = index.docbook
+HELP_LINGUAS = ar de el es eu fi fr hu ko oc pa sv uk vi zh_CN
 
 -include $(top_srcdir)/git.mk