[release-notes/gnome-3-4] Revert "build: Use new documentation infrastructure"



commit b0671ef2c55b1d60a94d744ae66b7551c83a71b8
Author: Javier JardÃn <jjardon gnome org>
Date:   Fri Mar 16 17:46:41 2012 +0000

    Revert "build: Use new documentation infrastructure"
    
    This reverts commit ad90c4f4e815d8d24253c2c32ae05b93493e8e82.

 Makefile.am      |    4 ++++
 configure.ac     |    2 +-
 help/Makefile.am |   11 +++++------
 3 files changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 15831f8..4302f39 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1 +1,5 @@
 SUBDIRS = help
+
+EXTRA_DIST = gnome-doc-utils.make
+DISTCLEANFILE = gnome-doc-utils.make
+DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper
diff --git a/configure.ac b/configure.ac
index b77fc41..31e3696 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE([foreign])
 AM_MAINTAINER_MODE([enable])
 
-YELP_HELP_INIT
+GNOME_DOC_INIT
 
 AC_CONFIG_FILES([
 Makefile
diff --git a/help/Makefile.am b/help/Makefile.am
index 415a696..9e472da 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,9 +1,8 @@
 # Fake Makefile.am to get the directory noticed by library.gnome.org
- YELP_HELP_RULES@
+include $(top_srcdir)/gnome-doc-utils.make
 
-HELP_ID = release-notes
-
-HELP_FILES = \
+DOC_MODULE = release-notes
+DOC_INCLUDES = \
  rnusers.xml \
  rna11y.xml \
  rndevelopers.xml \
@@ -12,7 +11,7 @@ HELP_FILES = \
  rnlookingforward.xml \
  $(NULL)
 
-HELP_MEDIA = \
+DOC_FIGURES = \
  $(NULL)
 
-HELP_LINGUAS = cs es gl pl
+DOC_LINGUAS = cs es gl pl



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]