040245e1e48488ff66e8d14231f7fe818e262df0
diff --git a/.svnignore b/.svnignore
new file mode 100644
index 0000000..5280e62
--- /dev/null
+++ b/.svnignore
@@ -0,0 +1,26 @@
+Makefile
+Makefile.in
+aclocal.m4
+autom4te.cache
+autoregen.sh
+config.cache
+config.h.in
+config.log
+config.status
+configure
+gtk-doc-*.tar.gz
+gtk-doc.cat
+gtk-doc.dsl
+gtk-doc.pc
+gtk-doc.spec
+gtkdoc-common.pl
+gtkdoc-fixxref
+gtkdoc-mkdb
+gtkdoc-mkhtml
+gtkdoc-mkman
+gtkdoc-mktmpl
+gtkdoc-scan
+gtkdoc-scangobj
+gtkdoc-scanobj
+gtkdocize
+gnome-doc-utils.make
diff --git a/Makefile.am b/Makefile.am
index 8d865ad..7aead3e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -79,5 +79,8 @@ EXTRA_DIST = \
   tools/gtk-doc.el \
   style.css \
   COPYING-DOCS \
-  omf.make \
-  xmldocs.make
+  gnome-doc-utils.make \
+  m4
+
+DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper
+DISTCLEANFILES = gnome-doc-utils.make
\ No newline at end of file
diff --git a/autogen.sh b/autogen.sh
index 91687d7..9935b4f 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -19,6 +19,12 @@ THEDIR="`pwd`"
 
 cd "$srcdir"
 
+which gnome-doc-prepare || {
+    echo "You need to install gnome-doc-utils to build this package"
+    exit 1
+}
+gnome-doc-prepare
+
 (autoconf --version) < /dev/null > /dev/null 2>&1 || {
 	echo
 	echo "You must have autoconf installed to compile $PROJECT."
@@ -64,14 +70,18 @@ if test "$#" = 0; then
         echo "to pass any to it, please specify them on the $0 command line."
 fi
 
+echo "* Running $ACLOCAL"
 $ACLOCAL $ACLOCAL_FLAGS || exit $?
 
+echo "* Running autoconf"
 autoconf || exit $?
 # optionally feature autoheader
 #(autoheader --version)  < /dev/null > /dev/null 2>&1 && autoheader
 
+echo "* Running libtoolize"
 libtoolize --copy --force
 
+echo "* Running $AUTOMAKE"
 $AUTOMAKE --add-missing $am_opt || exit $?
 
 cd "$THEDIR"
diff --git a/configure.in b/configure.in
index 397947a..33fcbe7 100644
--- a/configure.in
+++ b/configure.in
@@ -8,11 +8,14 @@ m4_define(gtk_doc_version, 1.10)
 AC_INIT([gtk-doc], [gtk_doc_version],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=gtk-doc])
 
+AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([gtk-doc.dsl.in])
 
 AM_INIT_AUTOMAKE
 AM_MAINTAINER_MODE
 
+GNOME_DOC_INIT
+
 # make sure $ACLOCAL_FLAGS are used during a rebuild.
 AC_SUBST([ACLOCAL_AMFLAGS], ["\${ACLOCAL_FLAGS}"])
 
@@ -111,9 +114,6 @@ if test x$scrollkeeper_config = xno; then
 #    AC_MSG_WARN([Couldn't find xsltproc, please install the libxml/libxslt package])
 #  fi
 fi
-AM_CONDITIONAL(ENABLE_SCROLLKEEPER, test ! x$scrollkeeper_config = xno)
-SCROLLKEEPER_BUILD_REQUIRED=0.3.5
-AC_SUBST(SCROLLKEEPER_BUILD_REQUIRED)
 
 # if glib is available we can enable the tests
 PKG_CHECK_MODULES(TEST_DEPS, [glib-2.0 >= 2.6.0 gobject-2.0 >= 2.6.0], [
@@ -139,8 +139,6 @@ gtk-doc.cat
 gtkdoc-common.pl
 help/Makefile
 help/manual/Makefile
-help/manual/C/Makefile
-help/manual/C/gtk-doc-manual-C.omf
 tests/Makefile
 tests/gobject/Makefile
 tests/gobject/src/Makefile
diff --git a/help/manual/.svnignore b/help/manual/.svnignore
new file mode 100644
index 0000000..7ffe53f
--- /dev/null
+++ b/help/manual/.svnignore
@@ -0,0 +1,4 @@
+Makefile.in
+Makefile
+*.omf
+
diff --git a/help/manual/C/ChangeLog b/help/manual/C/ChangeLog
deleted file mode 100644
index e56a7e9..0000000
--- a/help/manual/C/ChangeLog
+++ /dev/null
@@ -1,102 +0,0 @@
-2007-07-23  Stefan Kost  <ensonic@users.sf.net>
-
-	* gtk-doc-manual.xml:
-	  Tell about $(DOC_MODULE)-undeclared.txt.
-
-2007-07-15  Stefan Kost  <ensonic@users.sf.net>
-
-	* gtk-doc-manual.xml:
-	Bump version. Add more markup. Tell that one can use toolname --help to
-	get the allowed opetion for Makefile.am. Improve 'how does it work' section.
-
-2007-06-11  Damon Chaplin  <damon@gnome.org>
-
-	* gtk-doc-manual.xml: added tip about using entities like &num; to
-	use a '#' without gtk-doc changing it. (Part of #445596)
-
-2007-01-21  Damon Chaplin  <damon@gnome.org>
-
-	* gtk-doc-manual.xml: document "@include:" tag. #395023
-
-2006-12-10  J.H.M. Dassen (Ray) <jdassen@debian.org>
-
-	* gtk-doc-manual.xml: Spelling fixes.
-
-2006-10-13  Damon Chaplin  <damon@gnome.org>
-
-	* gtk-doc-manual.xml: use "GNOME" instead of "Gnome". (#352160)
-
-2006-03-24  Stefan Kost  <ensonic@users.sf.net>
-
-	* gtk-doc-manual.xml:
-	correct format of new shortcuts
-
-2006-03-21  Stefan Kost  <ensonic@users.sf.net>
-
-	* gtk-doc-manual.xml:
-	document signal and property link short cuts
-
-2005-12-09  Stefan Kost  <ensonic@users.sf.net>
-
-	* gtk-doc-manual-C.omf.in:
-	* gtk-doc-manual.xml:
-	  added more details about doc-comments
-	  added section about revision control systems
-
-2005-09-07  Stefan Kost  <ensonic@users.sf.net>
-
-	* gtk-doc-manual.xml:
-	  integrated most of the notes from the text files under doc/*.txt
-
-2005-08-24  Stefan Kost  <ensonic@users.sf.net>
-
-	* gtk-doc-manual.xml:
-          more notes in the faq
-          setup chapter is nearly complete
-          more notes about doc comment format
-
-2005-08-15  Stefan Kost  <ensonic@users.sf.net>
-
-	* .cvsignore:
-	* ChangeLog:
-	* Makefile:
-	* Makefile.am:
-	* fdl-appendix.xml:
-	* gtk-doc-manual-C.omf.in:
-	* gtk-doc-manual.xml:
-          reanimated gtkdoc manual
-          added new chapters
-
-2004-05-07	Geert Stappers <stappers@stappers.nl>
-
-	* README: new file.
-	* gtk-doc-manual.sgml: Deleted.
-	* fdl-appendix.sgml: Deleted.
-
-2004-05-06	Geert Stappers <stappers@stappers.nl>
-
-	* gtk-doc-manual.xml: repaired the crossreference to FDL
-
-	* Makefile: new file, to "document" the build process.
-
-2004-05-06	Keith Sharp <kms@passback.co.uk>
-
-	* gtk-doc-manual.xml: New file, XML version of
-	  gtk-doc-manual.sgml
-	* fdl-appendix.xml: New file, XML version of
-	  fdl-appendix.sgml
-
-2000-11-26	Dan Mueth <d-mueth@uchicago.edu>
-
-	* gtk-doc-manual.sgml: Committing changes made by
-	Chris Lyttle <chris@wilddev.net>.  (Text for Chapter 1)
-
-2000-11-25	Dan Mueth <d-mueth@uchicago.edu>
-
-	* gtk-doc-manual.sgml: Put part of the outline into SGML.
-	  Chris plans to put rest of outline in here and start
-	  writing.
-	* fdl-appendix.sgml: The FDL in SGML.  We will probably post
-	  these on the web as a single document (book) so we will
-	  need the FDL to be included as an appendix.
-
diff --git a/help/manual/C/Makefile.am b/help/manual/C/Makefile.am
deleted file mode 100644
index 7eabb3c..0000000
--- a/help/manual/C/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-figdir = 
-docname = gtk-doc-manual
-lang = C
-omffile = gtk-doc-manual-C.omf
-entities = fdl-appendix.xml
-
-if ENABLE_SCROLLKEEPER
-include $(top_srcdir)/xmldocs.make
-dist-hook: app-dist-hook
-else
-# here we should
-# a) invoke xslproc, if available
-# stylesheet=/opt/gnome/share/sgml/docbook/yelp/docbook/html/docbook.xsl
-# xsltproc --nonet $(stylesheet) $(docname).xml
-# b) simple install pregenerated html (pdf)
-endif
-
diff --git a/help/manual/C/gtk-doc-manual-C.omf.in b/help/manual/C/gtk-doc-manual-C.omf.in
deleted file mode 100644
index dadbe65..0000000
--- a/help/manual/C/gtk-doc-manual-C.omf.in
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE omf PUBLIC "-//OMF//DTD Scrollkeeper OMF Variant V1.0//EN" "http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd">
-<!--
-written according to
-http://scrollkeeper.sourceforge.net/documentation/writing_scrollkeeper_omf_files/index.html
--->
-<omf>
-  <resource>
-    <creator>
-      gtk-doc-list@gnome.org (gtk-doc developer team)
-    </creator>
-    <title>
-      GTK-Doc Manual
-    </title>
-    <date>
-      2005-08-01
-    </date>
-    <version identifier="@VERSION@" date="2005-08-01" description="GTK-Doc Manual"/>
-    <subject category="GNOME|Development"/>
-    <description>
-      User manual for developers with instructions of GTK-Doc usage.
-    </description>
-    <type>
-      user's guide
-    </type>
-    <format mime="text/xml" dtd="-//OASIS//DTD DocBook XML V4.1.2//EN"/>
-    <identifier url="gtk-doc-manual.xml"/>
-    <language code="C"/>
-    <!-- generated via scrollkeeper-gen-seriesid -->
-    <relation seriesid="04ecd20e-775e-11d9-81af-a7c5a5fa91f6"/>
-    <rights type="GNU FDL" license.version="1.1" holder="gtk-doc developer team"/>
-  </resource>
-</omf>
-
diff --git a/help/manual/C/gtk-doc-manual.xml b/help/manual/C/gtk-doc-manual.xml
index d780e98..5bf472d 100644
--- a/help/manual/C/gtk-doc-manual.xml
+++ b/help/manual/C/gtk-doc-manual.xml
@@ -11,6 +11,7 @@
   <bookinfo>
     <title>GTK-Doc Manual</title>
     <edition>1.10</edition>
+    <abstract role="description"><para>User manual for developers with instructions of GTK-Doc usage.</para></abstract>
     <authorgroup>
       <author>
         <firstname>Chris</firstname>
@@ -40,6 +41,7 @@
         </affiliation>
       </author>
     </authorgroup>
+    <publisher role="maintainer"><address><email>gtk-doc-list@gnome.org</email></address></publisher>
     <copyright>
       <year>2000, 2005, 2007</year>
       <holder>Dan Mueth and Chris Lyttle and Stefan Kost</holder>
@@ -69,6 +71,24 @@
         or initial caps.
       </para>
     </legalnotice>
+    
+    <revhistory>
+      <revision>
+	<revnumber>1.9.0</revnumber>
+	<date>14 Aug 2007</date>
+	<authorinitials>mal</authorinitials>
+	<revremark>GNOME doc-utils migration</revremark>      
+      </revision>
+    </revhistory>
+
+    <revhistory>
+      <revision>
+	<revnumber>1.9.0</revnumber>
+	<date>14 Aug 2007</date>
+	<authorinitials>mal</authorinitials>
+	<revremark>GNOME doc-utils migration</revremark>
+      </revision>
+    </revhistory>
 
   </bookinfo>
 
@@ -1269,7 +1289,7 @@ gtk_arrow_get_type
     <tip>
       <para>
         Enable or add the <option>TESTS=($GTKDOC_CHECK)</option> line in Makefile.am.
-        If at least gtk-doc 1.9 is installed, this will run sanity checks during 
+        If at least gtk-doc 1.9 is installed, this will run sanity checks during
         make check run.
       </para>
     </tip>
diff --git a/help/manual/ChangeLog b/help/manual/ChangeLog
new file mode 100644
index 0000000..5239d33
--- /dev/null
+++ b/help/manual/ChangeLog
@@ -0,0 +1,106 @@
+2007-08-14  Marc-Andre Lureau  <marcandre.lureau@gmail.com>
+
+	* GNOME doc-utils migration, ChangeLog moved to help/manual
+
+2007-07-23  Stefan Kost  <ensonic@users.sf.net>
+
+	* gtk-doc-manual.xml:
+	  Tell about $(DOC_MODULE)-undeclared.txt.
+
+2007-07-15  Stefan Kost  <ensonic@users.sf.net>
+
+	* gtk-doc-manual.xml:
+	Bump version. Add more markup. Tell that one can use toolname --help to
+	get the allowed opetion for Makefile.am. Improve 'how does it work' section.
+
+2007-06-11  Damon Chaplin  <damon@gnome.org>
+
+	* gtk-doc-manual.xml: added tip about using entities like &num; to
+	use a '#' without gtk-doc changing it. (Part of #445596)
+
+2007-01-21  Damon Chaplin  <damon@gnome.org>
+
+	* gtk-doc-manual.xml: document "@include:" tag. #395023
+
+2006-12-10  J.H.M. Dassen (Ray) <jdassen@debian.org>
+
+	* gtk-doc-manual.xml: Spelling fixes.
+
+2006-10-13  Damon Chaplin  <damon@gnome.org>
+
+	* gtk-doc-manual.xml: use "GNOME" instead of "Gnome". (#352160)
+
+2006-03-24  Stefan Kost  <ensonic@users.sf.net>
+
+	* gtk-doc-manual.xml:
+	correct format of new shortcuts
+
+2006-03-21  Stefan Kost  <ensonic@users.sf.net>
+
+	* gtk-doc-manual.xml:
+	document signal and property link short cuts
+
+2005-12-09  Stefan Kost  <ensonic@users.sf.net>
+
+	* gtk-doc-manual-C.omf.in:
+	* gtk-doc-manual.xml:
+	  added more details about doc-comments
+	  added section about revision control systems
+
+2005-09-07  Stefan Kost  <ensonic@users.sf.net>
+
+	* gtk-doc-manual.xml:
+	  integrated most of the notes from the text files under doc/*.txt
+
+2005-08-24  Stefan Kost  <ensonic@users.sf.net>
+
+	* gtk-doc-manual.xml:
+          more notes in the faq
+          setup chapter is nearly complete
+          more notes about doc comment format
+
+2005-08-15  Stefan Kost  <ensonic@users.sf.net>
+
+	* .cvsignore:
+	* ChangeLog:
+	* Makefile:
+	* Makefile.am:
+	* fdl-appendix.xml:
+	* gtk-doc-manual-C.omf.in:
+	* gtk-doc-manual.xml:
+          reanimated gtkdoc manual
+          added new chapters
+
+2004-05-07	Geert Stappers <stappers@stappers.nl>
+
+	* README: new file.
+	* gtk-doc-manual.sgml: Deleted.
+	* fdl-appendix.sgml: Deleted.
+
+2004-05-06	Geert Stappers <stappers@stappers.nl>
+
+	* gtk-doc-manual.xml: repaired the crossreference to FDL
+
+	* Makefile: new file, to "document" the build process.
+
+2004-05-06	Keith Sharp <kms@passback.co.uk>
+
+	* gtk-doc-manual.xml: New file, XML version of
+	  gtk-doc-manual.sgml
+	* fdl-appendix.xml: New file, XML version of
+	  fdl-appendix.sgml
+
+2000-11-26	Dan Mueth <d-mueth@uchicago.edu>
+
+	* gtk-doc-manual.sgml: Committing changes made by
+	Chris Lyttle <chris@wilddev.net>.  (Text for Chapter 1)
+
+2000-11-25	Dan Mueth <d-mueth@uchicago.edu>
+
+	* gtk-doc-manual.sgml: Put part of the outline into SGML.
+	  Chris plans to put rest of outline in here and start
+	  writing.
+	* fdl-appendix.sgml: The FDL in SGML.  We will probably post
+	  these on the web as a single document (book) so we will
+	  need the FDL to be included as an appendix.
+
diff --git a/help/manual/Makefile.am b/help/manual/Makefile.am
index 0b019cf..91a7d32 100644
--- a/help/manual/Makefile.am
+++ b/help/manual/Makefile.am
@@ -1,3 +1,7 @@
-## Process this file with automake to produce Makefile.in
-
-SUBDIRS = C
+include $(top_srcdir)/gnome-doc-utils.make
+dist-hook: doc-dist-hook
+DOC_MODULE = gtk-doc-manual
+DOC_ENTITIES = fdl-appendix.xml
+DOC_INCLUDES =
+DOC_FIGURES = 
+DOC_LINGUAS =
\ No newline at end of file
diff --git a/help/manual/gtk-doc-manual.omf.in b/help/manual/gtk-doc-manual.omf.in
new file mode 100644
index 0000000..4e59d75
--- /dev/null
+++ b/help/manual/gtk-doc-manual.omf.in
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<omf>
+  <resource>
+    <subject category="GNOME|Development"/>
+    <type>manual</type>
+    <relation seriesid="04ecd20e-775e-11d9-81af-a7c5a5fa91f6"/>
+    <rights type="GNU FDL" license.version="1.1" holder="gtk-doc developer team"/>
+  </resource>
+</omf>
+
+
+
+
+
+
diff --git a/m4/.svnignore b/m4/.svnignore
new file mode 100644
index 0000000..6ff3ad0
--- /dev/null
+++ b/m4/.svnignore
@@ -0,0 +1 @@
+gnome-doc-utils.m4
\ No newline at end of file
diff --git a/omf.make b/omf.make
deleted file mode 100644
index cb7acba..0000000
--- a/omf.make
+++ /dev/null
@@ -1,61 +0,0 @@
-# 
-# No modifications of this Makefile should be necessary.
-#
-# This file contains the build instructions for installing OMF files.  It is
-# generally called from the makefiles for particular formats of documentation.
-#
-# Note that you must configure your package with --localstatedir=/var
-# so that the scrollkeeper-update command below will update the database
-# in the standard scrollkeeper directory.
-#
-# If it is impossible to configure with --localstatedir=/var, then
-# modify the definition of scrollkeeper_localstate_dir so that
-# it points to the correct location. Note that you must still use 
-# $(localstatedir) in this or when people build RPMs it will update
-# the real database on their system instead of the one under RPM_BUILD_ROOT.
-#
-# Note: This make file is not incorporated into xmldocs.make because, in
-#       general, there will be other documents install besides XML documents
-#       and the makefiles for these formats should also include this file.
-#
-# About this file:
-#	This file was derived from scrollkeeper_example2, a package
-#	illustrating how to install documentation and OMF files for use with
-#	ScrollKeeper 0.3.x and 0.4.x.  For more information, see:
-#		http://scrollkeeper.sourceforge.net/	
-# 	Version: 0.1.3 (last updated: March 20, 2002)
-#
-
-omf_dest_dir=$(datadir)/omf/@PACKAGE@
-scrollkeeper_localstate_dir = $(localstatedir)/scrollkeeper
-
-# At some point, it may be wise to change to something like this:
-# scrollkeeper_localstate_dir = @SCROLLKEEPER_STATEDIR@
-
-omf: omf_timestamp
-
-omf_timestamp: $(omffile)
-	-for file in $(omffile); do \
-	  scrollkeeper-preinstall $(docdir)/$(docname).xml $(srcdir)/$$file $$file.out; \
-	done; \
-	touch omf_timestamp
-
-install-data-hook-omf:
-	$(mkinstalldirs) $(DESTDIR)$(omf_dest_dir)
-	for file in $(omffile); do \
-		$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
-	done
-	-scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
-
-uninstall-local-omf:
-	-for file in $(srcdir)/*.omf; do \
-		basefile=`basename $$file`; \
-		rm -f $(DESTDIR)$(omf_dest_dir)/$$basefile; \
-	done
-	-rmdir $(DESTDIR)$(omf_dest_dir)
-	-scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir)
-
-clean-local-omf:
-	-for file in $(omffile); do \
-		rm -f $$file.out; \
-	done
diff --git a/xmldocs.make b/xmldocs.make
deleted file mode 100644
index b93e3f3..0000000
--- a/xmldocs.make
+++ /dev/null
@@ -1,101 +0,0 @@
-#
-# No modifications of this Makefile should be necessary.
-#
-# To use this template:
-#     1) Define: figdir, docname, lang, omffile, and entities in
-#        your Makefile.am file for each document directory,
-#        although figdir, omffile, and entities may be empty
-#     2) Make sure the Makefile in (1) also includes 
-#	 "include $(top_srcdir)/xmldocs.make" and
-#	 "dist-hook: app-dist-hook".
-#     3) Optionally define 'entities' to hold xml entities which
-#        you would also like installed
-#     4) Figures must go under $(figdir)/ and be in PNG format
-#     5) You should only have one document per directory 
-#     6) Note that the figure directory, $(figdir)/, should not have its
-#        own Makefile since this Makefile installs those figures.
-#
-# example Makefile.am:
-#   figdir = figures
-#   docname = scrollkeeper-manual
-#   lang = C
-#   omffile=scrollkeeper-manual-C.omf
-#   entities = fdl.xml
-#   include $(top_srcdir)/xmldocs.make
-#   dist-hook: app-dist-hook
-#
-# About this file:
-#	This file was taken from scrollkeeper_example2, a package illustrating
-#	how to install documentation and OMF files for use with ScrollKeeper 
-#	0.3.x and 0.4.x.  For more information, see:
-#		http://scrollkeeper.sourceforge.net/
-#	Version: 0.1.2 (last updated: March 20, 2002)
-#
-
-
-# **********  Begin of section some packagers may need to modify  **********
-# This variable (docdir) specifies where the documents should be installed.
-# This default value should work for most packages.
-docdir = $(datadir)/gnome/help/$(docname)/$(lang)
-
-# **********  You should not have to edit below this line  **********
-xml_files = $(entities) $(docname).xml
-
-EXTRA_DIST = $(xml_files) $(omffile)
-CLEANFILES = omf_timestamp
-
-include $(top_srcdir)/omf.make
-
-all: omf
-
-$(docname).xml: $(entities)
-	-ourdir=`pwd`;  \
-	cd $(srcdir);   \
-	cp $(entities) $$ourdir
-
-app-dist-hook:
-	if test "$(figdir)"; then \
-	  $(mkinstalldirs) $(distdir)/$(figdir); \
-	  for file in $(srcdir)/$(figdir)/*.png; do \
-	    basefile=`echo $$file | sed -e  's,^.*/,,'`; \
-	    $(INSTALL_DATA) $$file $(distdir)/$(figdir)/$$basefile; \
-	  done \
-	fi
-
-install-data-local: omf
-	$(mkinstalldirs) $(DESTDIR)$(docdir)
-	for file in $(xml_files); do \
-	  cp $(srcdir)/$$file $(DESTDIR)$(docdir); \
-	done
-	if test "$(figdir)"; then \
-	  $(mkinstalldirs) $(DESTDIR)$(docdir)/$(figdir); \
-	  for file in $(srcdir)/$(figdir)/*.png; do \
-	    basefile=`echo $$file | sed -e  's,^.*/,,'`; \
-	    $(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/$(figdir)/$$basefile; \
-	  done \
-	fi
-
-install-data-hook: install-data-hook-omf
-
-uninstall-local: uninstall-local-doc uninstall-local-omf
-
-uninstall-local-doc:
-	-if test "$(figdir)"; then \
-	  for file in $(srcdir)/$(figdir)/*.png; do \
-	    basefile=`echo $$file | sed -e  's,^.*/,,'`; \
-	    rm -f $(DESTDIR)$(docdir)/$(figdir)/$$basefile; \
-	  done; \
-	  rmdir $(DESTDIR)$(docdir)/$(figdir); \
-	fi
-	-for file in $(xml_files); do \
-	  rm -f $(DESTDIR)$(docdir)/$$file; \
-	done
-	-rmdir $(DESTDIR)$(docdir)
-
-clean-local: clean-local-doc clean-local-omf
-
-# for non-srcdir builds, remove the copied entities.
-clean-local-doc:
-	if test $(srcdir) != .; then \
-	  rm -f $(entities); \
-	fi
