[gnome-user-docs] Use yelp.m4
- From: Shaun McCance <shaunm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-user-docs] Use yelp.m4
- Date: Mon, 9 May 2011 13:48:49 +0000 (UTC)
commit c12275f800a79fd6ce188fae4ef7dcbe10370a3e
Author: Shaun McCance <shaunm gnome org>
Date: Mon May 9 09:57:53 2011 -0400
Use yelp.m4
Makefile.am | 6 ------
configure.in | 4 +---
gnome-help/Makefile.am | 15 ++++++---------
3 files changed, 7 insertions(+), 18 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index cf89590..9c1ef62 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1 @@
SUBDIRS = gnome-help
-
-EXTRA_DIST = gnome-doc-utils.make
-
-DISTCLEANFILES = gnome-doc-utils.make
-
-DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper
diff --git a/configure.in b/configure.in
index 0647b8d..e1e3ec9 100644
--- a/configure.in
+++ b/configure.in
@@ -2,12 +2,10 @@ AC_INIT([gnome-user-docs], [3.0.2],
[http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-user-docs])
AM_INIT_AUTOMAKE
-GNOME_DOC_INIT
+HELP_INIT
AM_MAINTAINER_MODE
-PKG_CHECK_MODULES(GNOME2_USER_DOCS, [ gnome-doc-utils >= 0.5.6 ])
-
AC_OUTPUT([
Makefile
gnome-user-docs.spec
diff --git a/gnome-help/Makefile.am b/gnome-help/Makefile.am
index 41fbeba..415ae2a 100644
--- a/gnome-help/Makefile.am
+++ b/gnome-help/Makefile.am
@@ -1,10 +1,10 @@
-include $(top_srcdir)/gnome-doc-utils.make
+ HELP_RULES@
-DOC_ID = gnome-help
+HELP_ID = gnome-help
-DOC_LINGUAS = de fi es gl hi sv
+HELP_LINGUAS = de fi es gl hi sv
-DOC_FIGURES = \
+HELP_MEDIA = \
figures/gnome.png \
figures/gnome-searchtool.png \
figures/nautilus.png \
@@ -25,9 +25,8 @@ DOC_FIGURES = \
figures/universal-access-menu.png \
figures/yelp-icon-big.png
-DOC_INCLUDES = legal.xml
-
-DOC_PAGES = \
+HELP_FILES = \
+ legal.xml \
a11y-bouncekeys.page \
a11y-braille.page \
a11y-contrast.page \
@@ -242,5 +241,3 @@ DOC_PAGES = \
web-install-flash.page \
web-install-moonlight.page \
windows-key.page
-
-dist-hook: doc-dist-hook
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]