* gnome-user-docs.spec: Remove l10n stuff and associated patches. Not
authordc144907
Thu, 08 Dec 2005 17:51:26 +0000
changeset 6371 051a63f18680
parent 6370 f5003315e888
child 6372 befa114dcb67
* gnome-user-docs.spec: Remove l10n stuff and associated patches. Not maintained for OpenSolaris. * patches/gnome-user-docs-*.diff: Removed.
ChangeLog
gnome-user-docs.spec
patches/gnome-user-docs-01-l10n-online-help.diff
patches/gnome-user-docs-02-sun-desktop-section.diff
patches/gnome-user-docs-03-add-l10n-docs.diff
patches/gnome-user-docs-04-preface-xml.diff
patches/gnome-user-docs-05-omfdestdir.diff
patches/gnome-user-docs-06-sag_update.diff
patches/gnome-user-docs-07-access_guide.diff
patches/gnome-user-docs-08-orms.diff
patches/gnome-user-docs-09-linux-user-guide.diff
patches/gnome-user-docs-10-sag_linux.diff
--- a/ChangeLog	Thu Dec 08 17:09:49 2005 +0000
+++ b/ChangeLog	Thu Dec 08 17:51:26 2005 +0000
@@ -2,6 +2,9 @@
 
 	* shared-mime-info.spec: Remove l10n tarball. Not maintained in 
 	OpenSolaris releases.
+	* gnome-user-docs.spec: Remove l10n stuff and associated patches. Not 
+	maintained for OpenSolaris.
+	* patches/gnome-user-docs-*.diff: Removed.
 
 2005-12-08  Muktha  <[email protected]>
 
--- a/gnome-user-docs.spec	Thu Dec 08 17:09:49 2005 +0000
+++ b/gnome-user-docs.spec	Thu Dec 08 17:51:26 2005 +0000
@@ -15,30 +15,11 @@
 Vendor:			Sun Microsystems, Inc.
 Summary:		User Documentation for the GNOME desktop
 Source:		        http://ftp.gnome.org/pub/GNOME/sources/gnome2-user-docs/2.8/gnome2-user-docs-%{version}.tar.bz2	
-Source1:	        gnome-user-docs-l10n-online-help-ci-linux-1.3.tar.bz2
-Source2:		gnome-user-docs-AG-0.10linux.tar.bz2
-Source3:		quick-start-user-guide-0.5.tar.bz2
-Source4:		gnome-user-docs-SAG-0.17linux.tar.bz2
-Source5:		gnome-user-docs-SAG-0.13solaris.tar.bz2
-Source6:                gnome-user-docs-UG-0.28linux.tar.bz2
-Source7:                gnome-user-docs-UG-0.21solaris.tar.bz2
-Source8:		gnome-user-docs-ORMS-0.6solaris.tar.bz2
-Source9:		gnome-user-docs-ORMS-0.12linux.tar.bz2
-Patch1:		   	gnome-user-docs-01-l10n-online-help.diff
-Patch2:		   	gnome-user-docs-02-sun-desktop-section.diff
-Patch3:                 gnome-user-docs-03-add-l10n-docs.diff
-Patch4:                 gnome-user-docs-04-preface-xml.diff
-Patch5:                 gnome-user-docs-05-omfdestdir.diff
-Patch6:                 gnome-user-docs-06-sag_update.diff
-Patch7:                 gnome-user-docs-07-access_guide.diff
-Patch8:                 gnome-user-docs-08-orms.diff
-Patch9:                 gnome-user-docs-09-linux-user-guide.diff
-Patch10:                gnome-user-docs-10-sag_linux.diff
 URL:			http://developer.gnome.org/projects/gdp/
 BuildRoot:		%{_tmppath}/%{name}-%{version}-build
 Docdir:			%{_defaultdocdir}/doc
 
-%define                        scrollkeeper_version 0.3.12
+%define			scrollkeeper_version 0.3.12
 
 Prereq:			scrollkeeper >= %{scrollkeeper_version}
 Requires:		scrollkeeper >= %{scrollkeeper_version}
@@ -49,48 +30,6 @@
 
 %prep
 %setup -q -n gnome2-user-docs-%{version}
-rm -Rf gnome2-user-guide/C/figures
-%ifos solaris
-# FIXME: Use Linux UG tarball because floppy-formatter-C.omf not in Solaris ver
-# FIXME: and its absense breaks the build.
-# FIXME: bzcat %SOURCE7 | tar xvf -
-bzcat %SOURCE6 | tar xvf -
-%else
-bzcat %SOURCE6 | tar xvf -
-%endif
-bzcat %SOURCE3 | tar xf -
-%ifos solaris
-bzcat %SOURCE5 | tar xf -
-%else
-bzcat %SOURCE4 | tar xf -
-%endif
-bzcat %SOURCE2 | tar xf -
-%ifos solaris
-# FIXME: Use Linux ORMS tarball because online_update-C.omf not in Solaris ver
-# FIXME: and its absense breaks the build.
-# FIXME: bzcat %SOURCE8 | tar xf -
-bzcat %SOURCE9 | tar xf -
-%else
-bzcat %SOURCE9 | tar xf -
-%endif
-bzcat %SOURCE1 | tar xf -
-#FIXME: already applied: %patch2 -p1
-# %patch3 -p1
-%ifos solaris
-%patch4 -p1
-%else
-#FIXME: needs rework: %patch9 -p1
-%endif
-%patch5 -p1
-%ifos solaris
-%patch6 -p1
-%else
-#FIXME: needs rework: %patch10 -p1
-%endif
-%patch7 -p1
-#FIXME: needs rework: %patch8 -p1
-#FIXME: needs rework: %patch1 -p1
-
 
 %build
 %ifos linux
@@ -133,6 +72,9 @@
 %{_datadir}/omf/*
 
 %changelog
+* Thu Dec 08 2005 - [email protected]
+- Remove l10n stuff and associated patches. Not maintained for OpenSolaris.
+
 * Tue Nov 29 2005 - laca.com
 - remove javahelp stuff
 
--- a/patches/gnome-user-docs-01-l10n-online-help.diff	Thu Dec 08 17:09:49 2005 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,193 +0,0 @@
-diff -rNau gnome2-user-docs-2.5.0/configure.in gnome2-user-docs.new/configure.in
---- gnome2-user-docs-2.5.0/configure.in	2005-03-08 13:53:57.551492544 +0900
-+++ gnome2-user-docs.new/configure.in	2005-03-08 13:55:00.000000000 +0900
-@@ -39,22 +39,121 @@
- gnome-user-docs.spec
- gnome2-user-guide/Makefile
- gnome2-user-guide/C/Makefile
-+gnome2-user-guide/de/Makefile
-+gnome2-user-guide/es/Makefile
-+gnome2-user-guide/fr/Makefile
-+gnome2-user-guide/it/Makefile
-+gnome2-user-guide/sv/Makefile
-+gnome2-user-guide/ja/Makefile
-+gnome2-user-guide/ko/Makefile
-+gnome2-user-guide/zh_CN/Makefile
-+gnome2-user-guide/zh_TW/Makefile
-+gnome2-user-guide/zh_HK/Makefile
-+gnome2-user-guide/pt_BR/Makefile
- gnome2-accessibility-guide/Makefile
- gnome2-accessibility-guide/C/Makefile
-+gnome2-accessibility-guide/de/Makefile
-+gnome2-accessibility-guide/es/Makefile
-+gnome2-accessibility-guide/fr/Makefile
-+gnome2-accessibility-guide/it/Makefile
-+gnome2-accessibility-guide/sv/Makefile
-+gnome2-accessibility-guide/ja/Makefile
-+gnome2-accessibility-guide/ko/Makefile
-+gnome2-accessibility-guide/zh_CN/Makefile
-+gnome2-accessibility-guide/zh_TW/Makefile
-+gnome2-accessibility-guide/zh_HK/Makefile
-+gnome2-accessibility-guide/pt_BR/Makefile
- gnome2-system-admin-guide/Makefile
- gnome2-system-admin-guide/C/Makefile
-+gnome2-system-admin-guide/de/Makefile
-+gnome2-system-admin-guide/es/Makefile
-+gnome2-system-admin-guide/fr/Makefile
-+gnome2-system-admin-guide/it/Makefile
-+gnome2-system-admin-guide/sv/Makefile
-+gnome2-system-admin-guide/ja/Makefile
-+gnome2-system-admin-guide/ko/Makefile
-+gnome2-system-admin-guide/zh_CN/Makefile
-+gnome2-system-admin-guide/zh_TW/Makefile
-+gnome2-system-admin-guide/zh_HK/Makefile
-+gnome2-system-admin-guide/pt_BR/Makefile
- introduction-to-gnome/Makefile
- introduction-to-gnome/C/Makefile
- javadevelop/Makefile
- javadevelop/C/Makefile
-+javadevelop/de/Makefile
-+javadevelop/es/Makefile
-+javadevelop/fr/Makefile
-+javadevelop/it/Makefile
-+javadevelop/sv/Makefile
-+javadevelop/ja/Makefile
-+javadevelop/ko/Makefile
-+javadevelop/zh_CN/Makefile
-+javadevelop/zh_TW/Makefile
-+javadevelop/zh_HK/Makefile
-+javadevelop/pt_BR/Makefile
- jdsoverview/Makefile
- jdsoverview/C/Makefile
-+jdsoverview/de/Makefile
-+jdsoverview/es/Makefile
-+jdsoverview/fr/Makefile
-+jdsoverview/it/Makefile
-+jdsoverview/sv/Makefile
-+jdsoverview/ja/Makefile
-+jdsoverview/ko/Makefile
-+jdsoverview/zh_CN/Makefile
-+jdsoverview/zh_TW/Makefile
-+jdsoverview/zh_HK/Makefile
-+jdsoverview/pt_BR/Makefile
- mozilla_info/Makefile
- mozilla_info/C/Makefile
-+mozilla_info/de/Makefile
-+mozilla_info/es/Makefile
-+mozilla_info/fr/Makefile
-+mozilla_info/it/Makefile
-+mozilla_info/sv/Makefile
-+mozilla_info/ja/Makefile
-+mozilla_info/ko/Makefile
-+mozilla_info/zh_CN/Makefile
-+mozilla_info/zh_TW/Makefile
-+mozilla_info/zh_HK/Makefile
-+mozilla_info/pt_BR/Makefile
- office_info/Makefile
- office_info/C/Makefile
-+office_info/de/Makefile
-+office_info/es/Makefile
-+office_info/fr/Makefile
-+office_info/it/Makefile
-+office_info/sv/Makefile
-+office_info/ja/Makefile
-+office_info/ko/Makefile
-+office_info/zh_CN/Makefile
-+office_info/zh_TW/Makefile
-+office_info/zh_HK/Makefile
-+office_info/pt_BR/Makefile
- online_update/Makefile
- online_update/C/Makefile
-+online_update/de/Makefile
-+online_update/es/Makefile
-+online_update/fr/Makefile
-+online_update/it/Makefile
-+online_update/sv/Makefile
-+online_update/pt_BR/Makefile
-+online_update/ja/Makefile
-+online_update/ko/Makefile
-+online_update/zh_CN/Makefile
-+online_update/zh_TW/Makefile
-+online_update/zh_HK/Makefile
- sample_apps_info/Makefile
- sample_apps_info/C/Makefile
-+sample_apps_info/de/Makefile
-+sample_apps_info/es/Makefile
-+sample_apps_info/fr/Makefile
-+sample_apps_info/it/Makefile
-+sample_apps_info/sv/Makefile
-+sample_apps_info/ja/Makefile
-+sample_apps_info/ko/Makefile
-+sample_apps_info/zh_CN/Makefile
-+sample_apps_info/zh_TW/Makefile
-+sample_apps_info/zh_HK/Makefile
-+sample_apps_info/pt_BR/Makefile
- ])
-diff -rNau gnome2-user-docs-2.5.0/gnome2-accessibility-guide/Makefile.am gnome2-user-docs.new/gnome2-accessibility-guide/Makefile.am
---- gnome2-user-docs-2.5.0/gnome2-accessibility-guide/Makefile.am	2003-02-03 05:03:30.000000000 +0900
-+++ gnome2-user-docs.new/gnome2-accessibility-guide/Makefile.am	2005-03-08 13:53:24.000000000 +0900
-@@ -1,2 +1,2 @@
--SUBDIRS = C
-+SUBDIRS = C de es fr it sv ja ko zh_CN zh_TW zh_HK pt_BR
- 
-diff -rNau gnome2-user-docs-2.5.0/gnome2-system-admin-guide/Makefile.am gnome2-user-docs.new/gnome2-system-admin-guide/Makefile.am
---- gnome2-user-docs-2.5.0/gnome2-system-admin-guide/Makefile.am	2003-02-03 05:03:31.000000000 +0900
-+++ gnome2-user-docs.new/gnome2-system-admin-guide/Makefile.am	2005-03-08 13:53:24.000000000 +0900
-@@ -1,2 +1,2 @@
--SUBDIRS = C
-+SUBDIRS = C de es fr it sv ja ko zh_CN zh_TW zh_HK pt_BR
- 
-diff -rNau gnome2-user-docs-2.5.0/gnome2-user-guide/Makefile.am gnome2-user-docs.new/gnome2-user-guide/Makefile.am
---- gnome2-user-docs-2.5.0/gnome2-user-guide/Makefile.am	2003-09-09 03:42:48.000000000 +0900
-+++ gnome2-user-docs.new/gnome2-user-guide/Makefile.am	2005-03-08 13:53:24.000000000 +0900
-@@ -1 +1 @@
--SUBDIRS = C
-+SUBDIRS = C de es fr it sv ja ko zh_CN zh_TW zh_HK pt_BR
-diff -rNau gnome2-user-docs-2.5.0/javadevelop/Makefile.am gnome2-user-docs.new/javadevelop/Makefile.am
---- gnome2-user-docs-2.5.0/javadevelop/Makefile.am	2005-03-08 13:53:57.559491328 +0900
-+++ gnome2-user-docs.new/javadevelop/Makefile.am	2005-03-08 13:53:24.000000000 +0900
-@@ -1,2 +1,2 @@
--SUBDIRS = C
-+SUBDIRS = C de es fr it sv ja ko zh_CN zh_TW zh_HK pt_BR
- 
-diff -rNau gnome2-user-docs-2.5.0/jdsoverview/Makefile.am gnome2-user-docs.new/jdsoverview/Makefile.am
---- gnome2-user-docs-2.5.0/jdsoverview/Makefile.am	2005-03-08 13:53:57.561491024 +0900
-+++ gnome2-user-docs.new/jdsoverview/Makefile.am	2005-03-08 13:53:24.000000000 +0900
-@@ -1,2 +1,2 @@
--SUBDIRS = C
-+SUBDIRS = C de es fr it sv ja ko zh_CN zh_TW zh_HK pt_BR
- 
-diff -rNau gnome2-user-docs-2.5.0/mozilla_info/Makefile.am gnome2-user-docs.new/mozilla_info/Makefile.am
---- gnome2-user-docs-2.5.0/mozilla_info/Makefile.am	2005-03-08 13:53:57.553492240 +0900
-+++ gnome2-user-docs.new/mozilla_info/Makefile.am	2005-03-08 13:53:24.000000000 +0900
-@@ -1,2 +1,2 @@
--SUBDIRS = C
-+SUBDIRS = C de es fr it sv ja ko zh_CN zh_TW zh_HK pt_BR
- 
-diff -rNau gnome2-user-docs-2.5.0/office_info/Makefile.am gnome2-user-docs.new/office_info/Makefile.am
---- gnome2-user-docs-2.5.0/office_info/Makefile.am	2005-03-08 13:53:57.555491936 +0900
-+++ gnome2-user-docs.new/office_info/Makefile.am	2005-03-08 13:53:24.000000000 +0900
-@@ -1,2 +1,2 @@
--SUBDIRS = C
-+SUBDIRS = C de es fr it sv ja ko zh_CN zh_TW zh_HK pt_BR
- 
-diff -rNau gnome2-user-docs-2.5.0/online_update/Makefile.am gnome2-user-docs.new/online_update/Makefile.am
---- gnome2-user-docs-2.5.0/online_update/Makefile.am	2005-03-08 13:53:57.564490568 +0900
-+++ gnome2-user-docs.new/online_update/Makefile.am	2005-03-08 13:55:34.000000000 +0900
-@@ -1,2 +1,2 @@
--SUBDIRS = C
-+SUBDIRS = C de es fr it sv pt_BR ja ko zh_CN zh_TW zh_HK
- 
-diff -rNau gnome2-user-docs-2.5.0/sample_apps_info/Makefile.am gnome2-user-docs.new/sample_apps_info/Makefile.am
---- gnome2-user-docs-2.5.0/sample_apps_info/Makefile.am	2005-03-08 13:53:57.557491632 +0900
-+++ gnome2-user-docs.new/sample_apps_info/Makefile.am	2005-03-08 13:53:24.000000000 +0900
-@@ -1,2 +1,2 @@
--SUBDIRS = C
-+SUBDIRS = C de es fr it sv ja ko zh_CN zh_TW zh_HK pt_BR
- 
-diff -rNau gnome2-user-docs-2.5.0/sun-desktop/Makefile.am gnome2-user-docs.new/sun-desktop/Makefile.am
---- gnome2-user-docs-2.5.0/sun-desktop/Makefile.am	2003-09-26 23:25:49.000000000 +0900
-+++ gnome2-user-docs.new/sun-desktop/Makefile.am	2005-03-08 13:53:24.000000000 +0900
-@@ -1 +1 @@
--SUBDIRS = C
-+SUBDIRS = C de es fr it sv ja ko zh_CN zh_TW zh_HK pt_BR
--- a/patches/gnome-user-docs-02-sun-desktop-section.diff	Thu Dec 08 17:09:49 2005 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- gnome2-user-docs-2.5.0/Makefile.am.orig	Sun Feb  2 20:03:29 2003
-+++ gnome2-user-docs-2.5.0/Makefile.am	Fri Jul  9 17:26:21 2004
-@@ -1,7 +1,6 @@
- SUBDIRS = \
- 	gnome2-user-guide \
- 	gnome2-accessibility-guide \
--	gnome2-system-admin-guide \
--	introduction-to-gnome
-+	gnome2-system-admin-guide
- 
- EXTRA_DIST = gnome-user-docs.spec COPYING-DOCS xmldocs.make omf.make
--- a/patches/gnome-user-docs-03-add-l10n-docs.diff	Thu Dec 08 17:09:49 2005 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,563 +0,0 @@
-diff -ruN gnome2-user-docs-2.0.6/configure.in gnome2-user-docs-2.0.6-hack/configure.in
---- gnome2-user-docs-2.0.6/configure.in	2003-10-31 06:54:17.000000000 +0900
-+++ gnome2-user-docs-2.0.6-hack/configure.in	2003-10-31 06:53:05.000000000 +0900
-@@ -58,4 +58,13 @@
- introduction-to-gnome/C/Makefile
- sun-desktop/Makefile
- sun-desktop/C/Makefile
-+sun-desktop/de/Makefile
-+sun-desktop/es/Makefile
-+sun-desktop/fr/Makefile
-+sun-desktop/it/Makefile
-+sun-desktop/sv/Makefile
-+sun-desktop/ja/Makefile
-+sun-desktop/ko/Makefile
-+sun-desktop/zh_CN/Makefile
-+sun-desktop/zh_TW/Makefile
- ])
-diff -ruN gnome2-user-docs-2.0.6/gnome2-user-guide/de/Makefile.am gnome2-user-docs-2.0.6-hack/gnome2-user-guide/de/Makefile.am
---- gnome2-user-docs-2.0.6/gnome2-user-guide/de/Makefile.am	2003-07-21 18:48:18.000000000 +0900
-+++ gnome2-user-docs-2.0.6-hack/gnome2-user-guide/de/Makefile.am	2003-10-31 05:33:06.000000000 +0900
-@@ -1,11 +1,11 @@
- figdir = figures
- docname = user-guide
- lang = de
--extraomf =  wgosbasic-de.omf wgoscustaccess-de.omf wgoscustdesk-de.omf wgoscustlookandfeel-de.omf wgosdeskback-de.omf wgoseditmainmenu-de.omf wgosmetacity-de.omf wgosnautilus-de.omf wgosoverview-de.omf wgospanel-de.omf wgosstartsession-de.omf wglossary-de.omf
-+extraomf =  gosbasic-de.omf jdsstartapps-de.omf goscustdesk-de.omf jdsstartpreftools-de.omf gosdeskback-de.omf goseditmainmenu-de.omf gosmetacity-de.omf gosnautilus-de.omf gosoverview-de.omf gospanel-de.omf gosstartsession-de.omf
- omffile = user-guide-de.omf
--entities = legal.xml front.xml gosbasic.xml goscustaccess.xml goscustdesk.xml goscustlookandfeel.xml gosdeskback.xml goseditmainmenu.xml gosmetacity.xml gosnautilus.xml gosoverview.xml gospanel.xml gosstartsession.xml part1.xml part2.xml wgoscustdesk.xml wgoscustlookandfeel.xml wgosnautilus.xml wgospanel.xml glossary.xml wglossary.xml wgosbasic.xml wgosmetacity.xml wgosoverview.xml wgoseditmainmenu.xml wgoscustaccess.xml wgosdeskback.xml wgosstartsession.xml
-+entities = legal.xml front.xml glossary.xml gosbasic.xml jdsstartapps.xml goscustdesk.xml jdsstartpreftools.xml gosdeskback.xml goseditmainmenu.xml gosmetacity.xml gosnautilus.xml gosoverview.xml gospanel.xml gosstartsession.xml part1.xml part2.xml part3.xml wgosbasic.xml wjdsstartapps.xml wgoscustdesk.xml wjdsstartpreftools.xml wgosdeskback.xml wgoseditmainmenu.xml wgosmetacity.xml wgosnautilus.xml wgosoverview.xml wgospanel.xml wgosstartsession.xml
- include $(top_srcdir)/xmldocs.make
--omf_dest_dir1=$(datadir)/omf/$(docname)
-+#omf_dest_dir=$(datadir)/omf/$(docname)
- #
- # This is copy-paste from ../../omf.make and changed to actually 
- # do something sensible in this instance
-@@ -15,18 +15,18 @@
- 		scrollkeeper-preinstall $(docdir)/$(docname).xml $(srcdir)/$$file $$file.out; \
- 	done
- 	-for file in $(extraomf); do \
--		scrollkeeper-preinstall $(docdir)/`echo $$file | cut -f1 -d -`.xml $(srcdir)/$$file $$file.out; \
-+		scrollkeeper-preinstall $(docdir)/w`echo $$file | cut -f1 -d -`.xml $(srcdir)/$$file $$file.out; \
- 	done
- 	touch omf_timestamp
- #
- # Oh, and this one aswell - they need to get installed. omf.make is so primitive 8-(
- #
- install-data-hook-omf:
--	$(mkinstalldirs) $(DESTDIR)$(omf_dest_dir1)
-+	$(mkinstalldirs) $(DESTDIR)$(omf_dest_dir)
- 	for file in $(extraomf); do \
--		$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir1)/$$file; \
-+		$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
- 	done
--	-scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir1)
-+	-scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
- 
- dist-hook: app-dist-hook
- 
-diff -ruN gnome2-user-docs-2.0.6/gnome2-user-guide/es/Makefile.am gnome2-user-docs-2.0.6-hack/gnome2-user-guide/es/Makefile.am
---- gnome2-user-docs-2.0.6/gnome2-user-guide/es/Makefile.am	2003-07-21 18:50:24.000000000 +0900
-+++ gnome2-user-docs-2.0.6-hack/gnome2-user-guide/es/Makefile.am	2003-10-31 05:33:16.000000000 +0900
-@@ -1,11 +1,11 @@
- figdir = figures
- docname = user-guide
- lang = es
--extraomf =  wgosbasic-es.omf wgoscustaccess-es.omf wgoscustdesk-es.omf wgoscustlookandfeel-es.omf wgosdeskback-es.omf wgoseditmainmenu-es.omf wgosmetacity-es.omf wgosnautilus-es.omf wgosoverview-es.omf wgospanel-es.omf wgosstartsession-es.omf wglossary-es.omf
-+extraomf =  gosbasic-es.omf jdsstartapps-es.omf goscustdesk-es.omf jdsstartpreftools-es.omf gosdeskback-es.omf goseditmainmenu-es.omf gosmetacity-es.omf gosnautilus-es.omf gosoverview-es.omf gospanel-es.omf gosstartsession-es.omf
- omffile = user-guide-es.omf
--entities = legal.xml front.xml gosbasic.xml goscustaccess.xml goscustdesk.xml goscustlookandfeel.xml gosdeskback.xml goseditmainmenu.xml gosmetacity.xml gosnautilus.xml gosoverview.xml gospanel.xml gosstartsession.xml part1.xml part2.xml wgoscustdesk.xml wgoscustlookandfeel.xml wgosnautilus.xml wgospanel.xml glossary.xml wglossary.xml wgosbasic.xml wgosmetacity.xml wgosoverview.xml wgoseditmainmenu.xml wgoscustaccess.xml wgosdeskback.xml wgosstartsession.xml
-+entities = legal.xml front.xml glossary.xml gosbasic.xml jdsstartapps.xml goscustdesk.xml jdsstartpreftools.xml gosdeskback.xml goseditmainmenu.xml gosmetacity.xml gosnautilus.xml gosoverview.xml gospanel.xml gosstartsession.xml part1.xml part2.xml part3.xml wgosbasic.xml wjdsstartapps.xml wgoscustdesk.xml wjdsstartpreftools.xml wgosdeskback.xml wgoseditmainmenu.xml wgosmetacity.xml wgosnautilus.xml wgosoverview.xml wgospanel.xml wgosstartsession.xml
- include $(top_srcdir)/xmldocs.make
--omf_dest_dir1=$(datadir)/omf/$(docname)
-+#omf_dest_dir=$(datadir)/omf/$(docname)
- #
- # This is copy-paste from ../../omf.make and changed to actually 
- # do something sensible in this instance
-@@ -15,18 +15,18 @@
- 		scrollkeeper-preinstall $(docdir)/$(docname).xml $(srcdir)/$$file $$file.out; \
- 	done
- 	-for file in $(extraomf); do \
--		scrollkeeper-preinstall $(docdir)/`echo $$file | cut -f1 -d -`.xml $(srcdir)/$$file $$file.out; \
-+		scrollkeeper-preinstall $(docdir)/w`echo $$file | cut -f1 -d -`.xml $(srcdir)/$$file $$file.out; \
- 	done
- 	touch omf_timestamp
- #
- # Oh, and this one aswell - they need to get installed. omf.make is so primitive 8-(
- #
- install-data-hook-omf:
--	$(mkinstalldirs) $(DESTDIR)$(omf_dest_dir1)
-+	$(mkinstalldirs) $(DESTDIR)$(omf_dest_dir)
- 	for file in $(extraomf); do \
--		$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir1)/$$file; \
-+		$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
- 	done
--	-scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir1)
-+	-scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
- 
- dist-hook: app-dist-hook
- 
-diff -ruN gnome2-user-docs-2.0.6/gnome2-user-guide/fr/Makefile.am gnome2-user-docs-2.0.6-hack/gnome2-user-guide/fr/Makefile.am
---- gnome2-user-docs-2.0.6/gnome2-user-guide/fr/Makefile.am	2003-07-21 18:51:26.000000000 +0900
-+++ gnome2-user-docs-2.0.6-hack/gnome2-user-guide/fr/Makefile.am	2003-10-31 05:33:28.000000000 +0900
-@@ -1,11 +1,11 @@
- figdir = figures
- docname = user-guide
- lang = fr
--extraomf =  wgosbasic-fr.omf wgoscustaccess-fr.omf wgoscustdesk-fr.omf wgoscustlookandfeel-fr.omf wgosdeskback-fr.omf wgoseditmainmenu-fr.omf wgosmetacity-fr.omf wgosnautilus-fr.omf wgosoverview-fr.omf wgospanel-fr.omf wgosstartsession-fr.omf wglossary-fr.omf
-+extraomf =  gosbasic-fr.omf jdsstartapps-fr.omf goscustdesk-fr.omf jdsstartpreftools-fr.omf gosdeskback-fr.omf goseditmainmenu-fr.omf gosmetacity-fr.omf gosnautilus-fr.omf gosoverview-fr.omf gospanel-fr.omf gosstartsession-fr.omf
- omffile = user-guide-fr.omf
--entities = legal.xml front.xml gosbasic.xml goscustaccess.xml goscustdesk.xml goscustlookandfeel.xml gosdeskback.xml goseditmainmenu.xml gosmetacity.xml gosnautilus.xml gosoverview.xml gospanel.xml gosstartsession.xml part1.xml part2.xml wgoscustdesk.xml wgoscustlookandfeel.xml wgosnautilus.xml wgospanel.xml glossary.xml wglossary.xml wgosbasic.xml wgosmetacity.xml wgosoverview.xml wgoseditmainmenu.xml wgoscustaccess.xml wgosdeskback.xml wgosstartsession.xml
-+entities = legal.xml front.xml glossary.xml gosbasic.xml jdsstartapps.xml goscustdesk.xml jdsstartpreftools.xml gosdeskback.xml goseditmainmenu.xml gosmetacity.xml gosnautilus.xml gosoverview.xml gospanel.xml gosstartsession.xml part1.xml part2.xml part3.xml wgosbasic.xml wjdsstartapps.xml wgoscustdesk.xml wjdsstartpreftools.xml wgosdeskback.xml wgoseditmainmenu.xml wgosmetacity.xml wgosnautilus.xml wgosoverview.xml wgospanel.xml wgosstartsession.xml
- include $(top_srcdir)/xmldocs.make
--omf_dest_dir1=$(datadir)/omf/$(docname)
-+#omf_dest_dir=$(datadir)/omf/$(docname)
- #
- # This is copy-paste from ../../omf.make and changed to actually 
- # do something sensible in this instance
-@@ -15,18 +15,18 @@
- 		scrollkeeper-preinstall $(docdir)/$(docname).xml $(srcdir)/$$file $$file.out; \
- 	done
- 	-for file in $(extraomf); do \
--		scrollkeeper-preinstall $(docdir)/`echo $$file | cut -f1 -d -`.xml $(srcdir)/$$file $$file.out; \
-+		scrollkeeper-preinstall $(docdir)/w`echo $$file | cut -f1 -d -`.xml $(srcdir)/$$file $$file.out; \
- 	done
- 	touch omf_timestamp
- #
- # Oh, and this one aswell - they need to get installed. omf.make is so primitive 8-(
- #
- install-data-hook-omf:
--	$(mkinstalldirs) $(DESTDIR)$(omf_dest_dir1)
-+	$(mkinstalldirs) $(DESTDIR)$(omf_dest_dir)
- 	for file in $(extraomf); do \
--		$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir1)/$$file; \
-+		$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
- 	done
--	-scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir1)
-+	-scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
- 
- dist-hook: app-dist-hook
- 
-diff -ruN gnome2-user-docs-2.0.6/gnome2-user-guide/it/Makefile.am gnome2-user-docs-2.0.6-hack/gnome2-user-guide/it/Makefile.am
---- gnome2-user-docs-2.0.6/gnome2-user-guide/it/Makefile.am	2003-07-21 18:52:32.000000000 +0900
-+++ gnome2-user-docs-2.0.6-hack/gnome2-user-guide/it/Makefile.am	2003-10-31 05:33:46.000000000 +0900
-@@ -1,11 +1,11 @@
- figdir = figures
- docname = user-guide
- lang = it
--extraomf =  wgosbasic-it.omf wgoscustaccess-it.omf wgoscustdesk-it.omf wgoscustlookandfeel-it.omf wgosdeskback-it.omf wgoseditmainmenu-it.omf wgosmetacity-it.omf wgosnautilus-it.omf wgosoverview-it.omf wgospanel-it.omf wgosstartsession-it.omf wglossary-it.omf
-+extraomf =  gosbasic-it.omf jdsstartapps-it.omf goscustdesk-it.omf jdsstartpreftools-it.omf gosdeskback-it.omf goseditmainmenu-it.omf gosmetacity-it.omf gosnautilus-it.omf gosoverview-it.omf gospanel-it.omf gosstartsession-it.omf
- omffile = user-guide-it.omf
--entities = legal.xml front.xml gosbasic.xml goscustaccess.xml goscustdesk.xml goscustlookandfeel.xml gosdeskback.xml goseditmainmenu.xml gosmetacity.xml gosnautilus.xml gosoverview.xml gospanel.xml gosstartsession.xml part1.xml part2.xml wgoscustdesk.xml wgoscustlookandfeel.xml wgosnautilus.xml wgospanel.xml glossary.xml wglossary.xml wgosbasic.xml wgosmetacity.xml wgosoverview.xml wgoseditmainmenu.xml wgoscustaccess.xml wgosdeskback.xml wgosstartsession.xml
-+entities = legal.xml front.xml glossary.xml gosbasic.xml jdsstartapps.xml goscustdesk.xml jdsstartpreftools.xml gosdeskback.xml goseditmainmenu.xml gosmetacity.xml gosnautilus.xml gosoverview.xml gospanel.xml gosstartsession.xml part1.xml part2.xml part3.xml wgosbasic.xml wjdsstartapps.xml wgoscustdesk.xml wjdsstartpreftools.xml wgosdeskback.xml wgoseditmainmenu.xml wgosmetacity.xml wgosnautilus.xml wgosoverview.xml wgospanel.xml wgosstartsession.xml
- include $(top_srcdir)/xmldocs.make
--omf_dest_dir1=$(datadir)/omf/$(docname)
-+#omf_dest_dir=$(datadir)/omf/$(docname)
- #
- # This is copy-paste from ../../omf.make and changed to actually 
- # do something sensible in this instance
-@@ -15,18 +15,18 @@
- 		scrollkeeper-preinstall $(docdir)/$(docname).xml $(srcdir)/$$file $$file.out; \
- 	done
- 	-for file in $(extraomf); do \
--		scrollkeeper-preinstall $(docdir)/`echo $$file | cut -f1 -d -`.xml $(srcdir)/$$file $$file.out; \
-+		scrollkeeper-preinstall $(docdir)/w`echo $$file | cut -f1 -d -`.xml $(srcdir)/$$file $$file.out; \
- 	done
- 	touch omf_timestamp
- #
- # Oh, and this one aswell - they need to get installed. omf.make is so primitive 8-(
- #
- install-data-hook-omf:
--	$(mkinstalldirs) $(DESTDIR)$(omf_dest_dir1)
-+	$(mkinstalldirs) $(DESTDIR)$(omf_dest_dir)
- 	for file in $(extraomf); do \
--		$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir1)/$$file; \
-+		$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
- 	done
--	-scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir1)
-+	-scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
- 
- dist-hook: app-dist-hook
- 
-diff -ruN gnome2-user-docs-2.0.6/gnome2-user-guide/ja/Makefile.am gnome2-user-docs-2.0.6-hack/gnome2-user-guide/ja/Makefile.am
---- gnome2-user-docs-2.0.6/gnome2-user-guide/ja/Makefile.am	2003-07-21 18:53:35.000000000 +0900
-+++ gnome2-user-docs-2.0.6-hack/gnome2-user-guide/ja/Makefile.am	2003-10-31 05:33:57.000000000 +0900
-@@ -1,11 +1,11 @@
- figdir = figures
- docname = user-guide
- lang = ja
--extraomf =  wgosbasic-ja.omf wgoscustaccess-ja.omf wgoscustdesk-ja.omf wgoscustlookandfeel-ja.omf wgosdeskback-ja.omf wgoseditmainmenu-ja.omf wgosmetacity-ja.omf wgosnautilus-ja.omf wgosoverview-ja.omf wgospanel-ja.omf wgosstartsession-ja.omf wglossary-ja.omf
-+extraomf =  gosbasic-ja.omf jdsstartapps-ja.omf goscustdesk-ja.omf jdsstartpreftools-ja.omf gosdeskback-ja.omf goseditmainmenu-ja.omf gosmetacity-ja.omf gosnautilus-ja.omf gosoverview-ja.omf gospanel-ja.omf gosstartsession-ja.omf
- omffile = user-guide-ja.omf
--entities = legal.xml front.xml gosbasic.xml goscustaccess.xml goscustdesk.xml goscustlookandfeel.xml gosdeskback.xml goseditmainmenu.xml gosmetacity.xml gosnautilus.xml gosoverview.xml gospanel.xml gosstartsession.xml part1.xml part2.xml wgoscustdesk.xml wgoscustlookandfeel.xml wgosnautilus.xml wgospanel.xml glossary.xml wglossary.xml wgosbasic.xml wgosmetacity.xml wgosoverview.xml wgoseditmainmenu.xml wgoscustaccess.xml wgosdeskback.xml wgosstartsession.xml
-+entities = legal.xml front.xml glossary.xml gosbasic.xml jdsstartapps.xml goscustdesk.xml jdsstartpreftools.xml gosdeskback.xml goseditmainmenu.xml gosmetacity.xml gosnautilus.xml gosoverview.xml gospanel.xml gosstartsession.xml part1.xml part2.xml part3.xml wgosbasic.xml wjdsstartapps.xml wgoscustdesk.xml wjdsstartpreftools.xml wgosdeskback.xml wgoseditmainmenu.xml wgosmetacity.xml wgosnautilus.xml wgosoverview.xml wgospanel.xml wgosstartsession.xml
- include $(top_srcdir)/xmldocs.make
--omf_dest_dir1=$(datadir)/omf/$(docname)
-+#omf_dest_dir=$(datadir)/omf/$(docname)
- #
- # This is copy-paste from ../../omf.make and changed to actually 
- # do something sensible in this instance
-@@ -15,18 +15,18 @@
- 		scrollkeeper-preinstall $(docdir)/$(docname).xml $(srcdir)/$$file $$file.out; \
- 	done
- 	-for file in $(extraomf); do \
--		scrollkeeper-preinstall $(docdir)/`echo $$file | cut -f1 -d -`.xml $(srcdir)/$$file $$file.out; \
-+		scrollkeeper-preinstall $(docdir)/w`echo $$file | cut -f1 -d -`.xml $(srcdir)/$$file $$file.out; \
- 	done
- 	touch omf_timestamp
- #
- # Oh, and this one aswell - they need to get installed. omf.make is so primitive 8-(
- #
- install-data-hook-omf:
--	$(mkinstalldirs) $(DESTDIR)$(omf_dest_dir1)
-+	$(mkinstalldirs) $(DESTDIR)$(omf_dest_dir)
- 	for file in $(extraomf); do \
--		$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir1)/$$file; \
-+		$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
- 	done
--	-scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir1)
-+	-scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
- 
- dist-hook: app-dist-hook
- 
-diff -ruN gnome2-user-docs-2.0.6/gnome2-user-guide/ko/Makefile.am gnome2-user-docs-2.0.6-hack/gnome2-user-guide/ko/Makefile.am
---- gnome2-user-docs-2.0.6/gnome2-user-guide/ko/Makefile.am	2003-07-21 18:54:34.000000000 +0900
-+++ gnome2-user-docs-2.0.6-hack/gnome2-user-guide/ko/Makefile.am	2003-10-31 05:34:11.000000000 +0900
-@@ -1,11 +1,11 @@
- figdir = figures
- docname = user-guide
- lang = ko
--extraomf =  wgosbasic-ko.omf wgoscustaccess-ko.omf wgoscustdesk-ko.omf wgoscustlookandfeel-ko.omf wgosdeskback-ko.omf wgoseditmainmenu-ko.omf wgosmetacity-ko.omf wgosnautilus-ko.omf wgosoverview-ko.omf wgospanel-ko.omf wgosstartsession-ko.omf wglossary-ko.omf
-+extraomf =  gosbasic-ko.omf jdsstartapps-ko.omf goscustdesk-ko.omf jdsstartpreftools-ko.omf gosdeskback-ko.omf goseditmainmenu-ko.omf gosmetacity-ko.omf gosnautilus-ko.omf gosoverview-ko.omf gospanel-ko.omf gosstartsession-ko.omf
- omffile = user-guide-ko.omf
--entities = legal.xml front.xml gosbasic.xml goscustaccess.xml goscustdesk.xml goscustlookandfeel.xml gosdeskback.xml goseditmainmenu.xml gosmetacity.xml gosnautilus.xml gosoverview.xml gospanel.xml gosstartsession.xml part1.xml part2.xml wgoscustdesk.xml wgoscustlookandfeel.xml wgosnautilus.xml wgospanel.xml glossary.xml wglossary.xml wgosbasic.xml wgosmetacity.xml wgosoverview.xml wgoseditmainmenu.xml wgoscustaccess.xml wgosdeskback.xml wgosstartsession.xml
-+entities = legal.xml front.xml glossary.xml gosbasic.xml jdsstartapps.xml goscustdesk.xml jdsstartpreftools.xml gosdeskback.xml goseditmainmenu.xml gosmetacity.xml gosnautilus.xml gosoverview.xml gospanel.xml gosstartsession.xml part1.xml part2.xml part3.xml wgosbasic.xml wjdsstartapps.xml wgoscustdesk.xml wjdsstartpreftools.xml wgosdeskback.xml wgoseditmainmenu.xml wgosmetacity.xml wgosnautilus.xml wgosoverview.xml wgospanel.xml wgosstartsession.xml
- include $(top_srcdir)/xmldocs.make
--omf_dest_dir1=$(datadir)/omf/$(docname)
-+#omf_dest_dir=$(datadir)/omf/$(docname)
- #
- # This is copy-paste from ../../omf.make and changed to actually 
- # do something sensible in this instance
-@@ -15,18 +15,18 @@
- 		scrollkeeper-preinstall $(docdir)/$(docname).xml $(srcdir)/$$file $$file.out; \
- 	done
- 	-for file in $(extraomf); do \
--		scrollkeeper-preinstall $(docdir)/`echo $$file | cut -f1 -d -`.xml $(srcdir)/$$file $$file.out; \
-+		scrollkeeper-preinstall $(docdir)/w`echo $$file | cut -f1 -d -`.xml $(srcdir)/$$file $$file.out; \
- 	done
- 	touch omf_timestamp
- #
- # Oh, and this one aswell - they need to get installed. omf.make is so primitive 8-(
- #
- install-data-hook-omf:
--	$(mkinstalldirs) $(DESTDIR)$(omf_dest_dir1)
-+	$(mkinstalldirs) $(DESTDIR)$(omf_dest_dir)
- 	for file in $(extraomf); do \
--		$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir1)/$$file; \
-+		$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
- 	done
--	-scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir1)
-+	-scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
- 
- dist-hook: app-dist-hook
- 
-diff -ruN gnome2-user-docs-2.0.6/gnome2-user-guide/sv/Makefile.am gnome2-user-docs-2.0.6-hack/gnome2-user-guide/sv/Makefile.am
---- gnome2-user-docs-2.0.6/gnome2-user-guide/sv/Makefile.am	2003-07-21 18:55:30.000000000 +0900
-+++ gnome2-user-docs-2.0.6-hack/gnome2-user-guide/sv/Makefile.am	2003-10-31 05:34:24.000000000 +0900
-@@ -1,11 +1,11 @@
- figdir = figures
- docname = user-guide
- lang = sv
--extraomf =  wgosbasic-sv.omf wgoscustaccess-sv.omf wgoscustdesk-sv.omf wgoscustlookandfeel-sv.omf wgosdeskback-sv.omf wgoseditmainmenu-sv.omf wgosmetacity-sv.omf wgosnautilus-sv.omf wgosoverview-sv.omf wgospanel-sv.omf wgosstartsession-sv.omf wglossary-sv.omf
-+extraomf =  gosbasic-sv.omf jdsstartapps-sv.omf goscustdesk-sv.omf jdsstartpreftools-sv.omf gosdeskback-sv.omf goseditmainmenu-sv.omf gosmetacity-sv.omf gosnautilus-sv.omf gosoverview-sv.omf gospanel-sv.omf gosstartsession-sv.omf
- omffile = user-guide-sv.omf
--entities = legal.xml front.xml gosbasic.xml goscustaccess.xml goscustdesk.xml goscustlookandfeel.xml gosdeskback.xml goseditmainmenu.xml gosmetacity.xml gosnautilus.xml gosoverview.xml gospanel.xml gosstartsession.xml part1.xml part2.xml wgoscustdesk.xml wgoscustlookandfeel.xml wgosnautilus.xml wgospanel.xml glossary.xml wglossary.xml wgosbasic.xml wgosmetacity.xml wgosoverview.xml wgoseditmainmenu.xml wgoscustaccess.xml wgosdeskback.xml wgosstartsession.xml
-+entities = legal.xml front.xml glossary.xml gosbasic.xml jdsstartapps.xml goscustdesk.xml jdsstartpreftools.xml gosdeskback.xml goseditmainmenu.xml gosmetacity.xml gosnautilus.xml gosoverview.xml gospanel.xml gosstartsession.xml part1.xml part2.xml part3.xml wgosbasic.xml wjdsstartapps.xml wgoscustdesk.xml wjdsstartpreftools.xml wgosdeskback.xml wgoseditmainmenu.xml wgosmetacity.xml wgosnautilus.xml wgosoverview.xml wgospanel.xml wgosstartsession.xml
- include $(top_srcdir)/xmldocs.make
--omf_dest_dir1=$(datadir)/omf/$(docname)
-+#omf_dest_dir=$(datadir)/omf/$(docname)
- #
- # This is copy-paste from ../../omf.make and changed to actually 
- # do something sensible in this instance
-@@ -15,18 +15,18 @@
- 		scrollkeeper-preinstall $(docdir)/$(docname).xml $(srcdir)/$$file $$file.out; \
- 	done
- 	-for file in $(extraomf); do \
--		scrollkeeper-preinstall $(docdir)/`echo $$file | cut -f1 -d -`.xml $(srcdir)/$$file $$file.out; \
-+		scrollkeeper-preinstall $(docdir)/w`echo $$file | cut -f1 -d -`.xml $(srcdir)/$$file $$file.out; \
- 	done
- 	touch omf_timestamp
- #
- # Oh, and this one aswell - they need to get installed. omf.make is so primitive 8-(
- #
- install-data-hook-omf:
--	$(mkinstalldirs) $(DESTDIR)$(omf_dest_dir1)
-+	$(mkinstalldirs) $(DESTDIR)$(omf_dest_dir)
- 	for file in $(extraomf); do \
--		$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir1)/$$file; \
-+		$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
- 	done
--	-scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir1)
-+	-scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
- 
- dist-hook: app-dist-hook
- 
-diff -ruN gnome2-user-docs-2.0.6/gnome2-user-guide/zh_CN/Makefile.am gnome2-user-docs-2.0.6-hack/gnome2-user-guide/zh_CN/Makefile.am
---- gnome2-user-docs-2.0.6/gnome2-user-guide/zh_CN/Makefile.am	2003-07-21 18:56:26.000000000 +0900
-+++ gnome2-user-docs-2.0.6-hack/gnome2-user-guide/zh_CN/Makefile.am	2003-10-31 05:34:38.000000000 +0900
-@@ -1,11 +1,11 @@
- figdir = figures
- docname = user-guide
- lang = zh_CN
--extraomf =  wgosbasic-zh_CN.omf wgoscustaccess-zh_CN.omf wgoscustdesk-zh_CN.omf wgoscustlookandfeel-zh_CN.omf wgosdeskback-zh_CN.omf wgoseditmainmenu-zh_CN.omf wgosmetacity-zh_CN.omf wgosnautilus-zh_CN.omf wgosoverview-zh_CN.omf wgospanel-zh_CN.omf wgosstartsession-zh_CN.omf wglossary-zh_CN.omf
-+extraomf =  gosbasic-zh_CN.omf jdsstartapps-zh_CN.omf goscustdesk-zh_CN.omf jdsstartpreftools-zh_CN.omf gosdeskback-zh_CN.omf goseditmainmenu-zh_CN.omf gosmetacity-zh_CN.omf gosnautilus-zh_CN.omf gosoverview-zh_CN.omf gospanel-zh_CN.omf gosstartsession-zh_CN.omf
- omffile = user-guide-zh_CN.omf
--entities = legal.xml front.xml gosbasic.xml goscustaccess.xml goscustdesk.xml goscustlookandfeel.xml gosdeskback.xml goseditmainmenu.xml gosmetacity.xml gosnautilus.xml gosoverview.xml gospanel.xml gosstartsession.xml part1.xml part2.xml wgoscustdesk.xml wgoscustlookandfeel.xml wgosnautilus.xml wgospanel.xml glossary.xml wglossary.xml wgosbasic.xml wgosmetacity.xml wgosoverview.xml wgoseditmainmenu.xml wgoscustaccess.xml wgosdeskback.xml wgosstartsession.xml
-+entities = legal.xml front.xml glossary.xml gosbasic.xml jdsstartapps.xml goscustdesk.xml jdsstartpreftools.xml gosdeskback.xml goseditmainmenu.xml gosmetacity.xml gosnautilus.xml gosoverview.xml gospanel.xml gosstartsession.xml part1.xml part2.xml part3.xml wgosbasic.xml wjdsstartapps.xml wgoscustdesk.xml wjdsstartpreftools.xml wgosdeskback.xml wgoseditmainmenu.xml wgosmetacity.xml wgosnautilus.xml wgosoverview.xml wgospanel.xml wgosstartsession.xml
- include $(top_srcdir)/xmldocs.make
--omf_dest_dir1=$(datadir)/omf/$(docname)
-+#omf_dest_dir=$(datadir)/omf/$(docname)
- #
- # This is copy-paste from ../../omf.make and changed to actually 
- # do something sensible in this instance
-@@ -15,18 +15,18 @@
- 		scrollkeeper-preinstall $(docdir)/$(docname).xml $(srcdir)/$$file $$file.out; \
- 	done
- 	-for file in $(extraomf); do \
--		scrollkeeper-preinstall $(docdir)/`echo $$file | cut -f1 -d -`.xml $(srcdir)/$$file $$file.out; \
-+		scrollkeeper-preinstall $(docdir)/w`echo $$file | cut -f1 -d -`.xml $(srcdir)/$$file $$file.out; \
- 	done
- 	touch omf_timestamp
- #
- # Oh, and this one aswell - they need to get installed. omf.make is so primitive 8-(
- #
- install-data-hook-omf:
--	$(mkinstalldirs) $(DESTDIR)$(omf_dest_dir1)
-+	$(mkinstalldirs) $(DESTDIR)$(omf_dest_dir)
- 	for file in $(extraomf); do \
--		$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir1)/$$file; \
-+		$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
- 	done
--	-scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir1)
-+	-scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
- 
- dist-hook: app-dist-hook
- 
-diff -ruN gnome2-user-docs-2.0.6/gnome2-user-guide/zh_TW/Makefile.am gnome2-user-docs-2.0.6-hack/gnome2-user-guide/zh_TW/Makefile.am
---- gnome2-user-docs-2.0.6/gnome2-user-guide/zh_TW/Makefile.am	2003-07-21 18:57:22.000000000 +0900
-+++ gnome2-user-docs-2.0.6-hack/gnome2-user-guide/zh_TW/Makefile.am	2003-10-31 05:34:51.000000000 +0900
-@@ -1,11 +1,11 @@
- figdir = figures
- docname = user-guide
- lang = zh_TW
--extraomf =  wgosbasic-zh_TW.omf wgoscustaccess-zh_TW.omf wgoscustdesk-zh_TW.omf wgoscustlookandfeel-zh_TW.omf wgosdeskback-zh_TW.omf wgoseditmainmenu-zh_TW.omf wgosmetacity-zh_TW.omf wgosnautilus-zh_TW.omf wgosoverview-zh_TW.omf wgospanel-zh_TW.omf wgosstartsession-zh_TW.omf wglossary-zh_TW.omf
-+extraomf =  gosbasic-zh_TW.omf jdsstartapps-zh_TW.omf goscustdesk-zh_TW.omf jdsstartpreftools-zh_TW.omf gosdeskback-zh_TW.omf goseditmainmenu-zh_TW.omf gosmetacity-zh_TW.omf gosnautilus-zh_TW.omf gosoverview-zh_TW.omf gospanel-zh_TW.omf gosstartsession-zh_TW.omf
- omffile = user-guide-zh_TW.omf
--entities = legal.xml front.xml gosbasic.xml goscustaccess.xml goscustdesk.xml goscustlookandfeel.xml gosdeskback.xml goseditmainmenu.xml gosmetacity.xml gosnautilus.xml gosoverview.xml gospanel.xml gosstartsession.xml part1.xml part2.xml wgoscustdesk.xml wgoscustlookandfeel.xml wgosnautilus.xml wgospanel.xml glossary.xml wglossary.xml wgosbasic.xml wgosmetacity.xml wgosoverview.xml wgoseditmainmenu.xml wgoscustaccess.xml wgosdeskback.xml wgosstartsession.xml
-+entities = legal.xml front.xml glossary.xml gosbasic.xml jdsstartapps.xml goscustdesk.xml jdsstartpreftools.xml gosdeskback.xml goseditmainmenu.xml gosmetacity.xml gosnautilus.xml gosoverview.xml gospanel.xml gosstartsession.xml part1.xml part2.xml part3.xml wgosbasic.xml wjdsstartapps.xml wgoscustdesk.xml wjdsstartpreftools.xml wgosdeskback.xml wgoseditmainmenu.xml wgosmetacity.xml wgosnautilus.xml wgosoverview.xml wgospanel.xml wgosstartsession.xml
- include $(top_srcdir)/xmldocs.make
--omf_dest_dir1=$(datadir)/omf/$(docname)
-+#omf_dest_dir=$(datadir)/omf/$(docname)
- #
- # This is copy-paste from ../../omf.make and changed to actually 
- # do something sensible in this instance
-@@ -15,18 +15,18 @@
- 		scrollkeeper-preinstall $(docdir)/$(docname).xml $(srcdir)/$$file $$file.out; \
- 	done
- 	-for file in $(extraomf); do \
--		scrollkeeper-preinstall $(docdir)/`echo $$file | cut -f1 -d -`.xml $(srcdir)/$$file $$file.out; \
-+		scrollkeeper-preinstall $(docdir)/w`echo $$file | cut -f1 -d -`.xml $(srcdir)/$$file $$file.out; \
- 	done
- 	touch omf_timestamp
- #
- # Oh, and this one aswell - they need to get installed. omf.make is so primitive 8-(
- #
- install-data-hook-omf:
--	$(mkinstalldirs) $(DESTDIR)$(omf_dest_dir1)
-+	$(mkinstalldirs) $(DESTDIR)$(omf_dest_dir)
- 	for file in $(extraomf); do \
--		$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir1)/$$file; \
-+		$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
- 	done
--	-scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir1)
-+	-scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
- 
- dist-hook: app-dist-hook
- 
-diff -ruN gnome2-user-docs-2.0.6/sun-desktop/Makefile.am gnome2-user-docs-2.0.6-hack/sun-desktop/Makefile.am
---- gnome2-user-docs-2.0.6/sun-desktop/Makefile.am	2003-09-26 23:25:49.000000000 +0900
-+++ gnome2-user-docs-2.0.6-hack/sun-desktop/Makefile.am	2003-10-31 05:35:55.000000000 +0900
-@@ -1 +1 @@
--SUBDIRS = C
-+SUBDIRS = C de es fr it ja ko sv zh_CN zh_TW
-diff -ruN gnome2-user-docs-2.0.6/sun-desktop/de/Makefile.am gnome2-user-docs-2.0.6-hack/sun-desktop/de/Makefile.am
---- gnome2-user-docs-2.0.6/sun-desktop/de/Makefile.am	1970-01-01 09:00:00.000000000 +0900
-+++ gnome2-user-docs-2.0.6-hack/sun-desktop/de/Makefile.am	2003-10-31 05:36:33.000000000 +0900
-@@ -0,0 +1,15 @@
-+figdir = figures
-+docname = quick-start-user-guide
-+lang = de
-+omffile = quick-start-user-guide-de.omf
-+entities = Abstract.xml \
-+	   legal.xml \
-+	   other-trademarks.xml \
-+	   preface.xml \
-+	   sdlinstdintro.xml \
-+	   sun-trademarks.xml \
-+	   sundocs.xml \
-+	   typeconv.xml
-+	   	   
-+include $(top_srcdir)/xmldocs.make
-+dist-hook: app-dist-hook
-diff -ruN gnome2-user-docs-2.0.6/sun-desktop/es/Makefile.am gnome2-user-docs-2.0.6-hack/sun-desktop/es/Makefile.am
---- gnome2-user-docs-2.0.6/sun-desktop/es/Makefile.am	1970-01-01 09:00:00.000000000 +0900
-+++ gnome2-user-docs-2.0.6-hack/sun-desktop/es/Makefile.am	2003-10-31 05:36:38.000000000 +0900
-@@ -0,0 +1,15 @@
-+figdir = figures
-+docname = quick-start-user-guide
-+lang = es
-+omffile = quick-start-user-guide-es.omf
-+entities = Abstract.xml \
-+	   legal.xml \
-+	   other-trademarks.xml \
-+	   preface.xml \
-+	   sdlinstdintro.xml \
-+	   sun-trademarks.xml \
-+	   sundocs.xml \
-+	   typeconv.xml
-+	   	   
-+include $(top_srcdir)/xmldocs.make
-+dist-hook: app-dist-hook
-diff -ruN gnome2-user-docs-2.0.6/sun-desktop/fr/Makefile.am gnome2-user-docs-2.0.6-hack/sun-desktop/fr/Makefile.am
---- gnome2-user-docs-2.0.6/sun-desktop/fr/Makefile.am	1970-01-01 09:00:00.000000000 +0900
-+++ gnome2-user-docs-2.0.6-hack/sun-desktop/fr/Makefile.am	2003-10-31 05:36:42.000000000 +0900
-@@ -0,0 +1,15 @@
-+figdir = figures
-+docname = quick-start-user-guide
-+lang = fr
-+omffile = quick-start-user-guide-fr.omf
-+entities = Abstract.xml \
-+	   legal.xml \
-+	   other-trademarks.xml \
-+	   preface.xml \
-+	   sdlinstdintro.xml \
-+	   sun-trademarks.xml \
-+	   sundocs.xml \
-+	   typeconv.xml
-+	   	   
-+include $(top_srcdir)/xmldocs.make
-+dist-hook: app-dist-hook
-diff -ruN gnome2-user-docs-2.0.6/sun-desktop/it/Makefile.am gnome2-user-docs-2.0.6-hack/sun-desktop/it/Makefile.am
---- gnome2-user-docs-2.0.6/sun-desktop/it/Makefile.am	1970-01-01 09:00:00.000000000 +0900
-+++ gnome2-user-docs-2.0.6-hack/sun-desktop/it/Makefile.am	2003-10-31 05:36:46.000000000 +0900
-@@ -0,0 +1,15 @@
-+figdir = figures
-+docname = quick-start-user-guide
-+lang = it
-+omffile = quick-start-user-guide-it.omf
-+entities = Abstract.xml \
-+	   legal.xml \
-+	   other-trademarks.xml \
-+	   preface.xml \
-+	   sdlinstdintro.xml \
-+	   sun-trademarks.xml \
-+	   sundocs.xml \
-+	   typeconv.xml
-+	   	   
-+include $(top_srcdir)/xmldocs.make
-+dist-hook: app-dist-hook
-diff -ruN gnome2-user-docs-2.0.6/sun-desktop/ja/Makefile.am gnome2-user-docs-2.0.6-hack/sun-desktop/ja/Makefile.am
---- gnome2-user-docs-2.0.6/sun-desktop/ja/Makefile.am	1970-01-01 09:00:00.000000000 +0900
-+++ gnome2-user-docs-2.0.6-hack/sun-desktop/ja/Makefile.am	2003-10-31 05:36:49.000000000 +0900
-@@ -0,0 +1,15 @@
-+figdir = figures
-+docname = quick-start-user-guide
-+lang = ja
-+omffile = quick-start-user-guide-ja.omf
-+entities = Abstract.xml \
-+	   legal.xml \
-+	   other-trademarks.xml \
-+	   preface.xml \
-+	   sdlinstdintro.xml \
-+	   sun-trademarks.xml \
-+	   sundocs.xml \
-+	   typeconv.xml
-+	   	   
-+include $(top_srcdir)/xmldocs.make
-+dist-hook: app-dist-hook
-diff -ruN gnome2-user-docs-2.0.6/sun-desktop/ko/Makefile.am gnome2-user-docs-2.0.6-hack/sun-desktop/ko/Makefile.am
---- gnome2-user-docs-2.0.6/sun-desktop/ko/Makefile.am	1970-01-01 09:00:00.000000000 +0900
-+++ gnome2-user-docs-2.0.6-hack/sun-desktop/ko/Makefile.am	2003-10-31 05:36:54.000000000 +0900
-@@ -0,0 +1,15 @@
-+figdir = figures
-+docname = quick-start-user-guide
-+lang = ko
-+omffile = quick-start-user-guide-ko.omf
-+entities = Abstract.xml \
-+	   legal.xml \
-+	   other-trademarks.xml \
-+	   preface.xml \
-+	   sdlinstdintro.xml \
-+	   sun-trademarks.xml \
-+	   sundocs.xml \
-+	   typeconv.xml
-+	   	   
-+include $(top_srcdir)/xmldocs.make
-+dist-hook: app-dist-hook
-diff -ruN gnome2-user-docs-2.0.6/sun-desktop/sv/Makefile.am gnome2-user-docs-2.0.6-hack/sun-desktop/sv/Makefile.am
---- gnome2-user-docs-2.0.6/sun-desktop/sv/Makefile.am	1970-01-01 09:00:00.000000000 +0900
-+++ gnome2-user-docs-2.0.6-hack/sun-desktop/sv/Makefile.am	2003-10-31 05:36:58.000000000 +0900
-@@ -0,0 +1,15 @@
-+figdir = figures
-+docname = quick-start-user-guide
-+lang = sv
-+omffile = quick-start-user-guide-sv.omf
-+entities = Abstract.xml \
-+	   legal.xml \
-+	   other-trademarks.xml \
-+	   preface.xml \
-+	   sdlinstdintro.xml \
-+	   sun-trademarks.xml \
-+	   sundocs.xml \
-+	   typeconv.xml
-+	   	   
-+include $(top_srcdir)/xmldocs.make
-+dist-hook: app-dist-hook
-diff -ruN gnome2-user-docs-2.0.6/sun-desktop/zh_CN/Makefile.am gnome2-user-docs-2.0.6-hack/sun-desktop/zh_CN/Makefile.am
---- gnome2-user-docs-2.0.6/sun-desktop/zh_CN/Makefile.am	1970-01-01 09:00:00.000000000 +0900
-+++ gnome2-user-docs-2.0.6-hack/sun-desktop/zh_CN/Makefile.am	2003-10-31 05:37:02.000000000 +0900
-@@ -0,0 +1,15 @@
-+figdir = figures
-+docname = quick-start-user-guide
-+lang = zh_CN
-+omffile = quick-start-user-guide-zh_CN.omf
-+entities = Abstract.xml \
-+	   legal.xml \
-+	   other-trademarks.xml \
-+	   preface.xml \
-+	   sdlinstdintro.xml \
-+	   sun-trademarks.xml \
-+	   sundocs.xml \
-+	   typeconv.xml
-+	   	   
-+include $(top_srcdir)/xmldocs.make
-+dist-hook: app-dist-hook
-diff -ruN gnome2-user-docs-2.0.6/sun-desktop/zh_TW/Makefile.am gnome2-user-docs-2.0.6-hack/sun-desktop/zh_TW/Makefile.am
---- gnome2-user-docs-2.0.6/sun-desktop/zh_TW/Makefile.am	1970-01-01 09:00:00.000000000 +0900
-+++ gnome2-user-docs-2.0.6-hack/sun-desktop/zh_TW/Makefile.am	2003-10-31 05:37:11.000000000 +0900
-@@ -0,0 +1,15 @@
-+figdir = figures
-+docname = quick-start-user-guide
-+lang = zh_TW
-+omffile = quick-start-user-guide-zh_TW.omf
-+entities = Abstract.xml \
-+	   legal.xml \
-+	   other-trademarks.xml \
-+	   preface.xml \
-+	   sdlinstdintro.xml \
-+	   sun-trademarks.xml \
-+	   sundocs.xml \
-+	   typeconv.xml
-+	   	   
-+include $(top_srcdir)/xmldocs.make
-+dist-hook: app-dist-hook
--- a/patches/gnome-user-docs-04-preface-xml.diff	Thu Dec 08 17:09:49 2005 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
---- gnome2-user-docs-2.5.0/gnome2-user-guide/C/Makefile.am.orig	2005-02-09 14:44:22.638962584 +0000
-+++ gnome2-user-docs-2.5.0/gnome2-user-guide/C/Makefile.am	2005-02-09 14:45:49.532752720 +0000
-@@ -1,11 +1,10 @@
--wgos_files = wgosbasic.xml wgoscustaccess.xml wgoscustdesk.xml wgoscustlookandfeel.xml wgosdeskback.xml wgoseditmainmenu.xml wgosmetacity.xml wgosnautilus.xml wgosoverview.xml wgospanel.xml wgosstartsession.xml
- 
--entities = legal.xml glossary.xml gosbasic.xml goscustaccess.xml goscustdesk.xml goscustlookandfeel.xml gosdeskback.xml goseditmainmenu.xml gosmetacity.xml gosnautilus.xml gosoverview.xml gospanel.xml gosstartsession.xml part1.xml part2.xml plaingnomestartpreftools.xml goscustdesk-remotedesktop.xml $(wgos_files)
-+entities = legal.xml glossary.xml goscustdesk.xml gosdeskback.xml goseditmainmenu.xml gosmetacity.xml gosnautilus.xml gospanel.xml gosstartsession.xml appendix.xml preface.xml sundocs.xml typeconv.xml mouseconv.xml appendixa.xml platformnote.xml plaingnomestartpreftools.xml goscustdesk-remotedesktop.xml
- 
- figdir = figures
- docname = user-guide
- lang = C
--omffile = user-guide-C.omf
-+omffile = user-guide-C.omf floppy-formatter-C.omf force-quit-C.omf lock-C.omf log-out-C.omf network-places-C.omf new-login-C.omf new-login-nested-C.omf notification-area-C.omf run-C.omf screenshot-C.omf show-desktop-C.omf window-selector-C.omf
- 
- include $(top_srcdir)/xmldocs.make
- 
--- a/patches/gnome-user-docs-05-omfdestdir.diff	Thu Dec 08 17:09:49 2005 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
---- gnome2-user-docs-2.5.0/gnome2-user-guide/C/Makefile.am.orig Mon Jun 14 10:59:18 2004
-+++ gnome2-user-docs-2.5.0/gnome2-user-guide/C/Makefile.am      Mon Jun 14 10:59:26 2004
-@@ -9,7 +9,7 @@
-
- include $(top_srcdir)/xmldocs.make
-
--omf_dest_dir=$(datadir)/omf/$(docname)
-+# omf_dest_dir=$(datadir)/omf/$(docname)
-
- dist-hook: app-dist-hook
--- a/patches/gnome-user-docs-06-sag_update.diff	Thu Dec 08 17:09:49 2005 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
---- gnome2-user-docs-2.8.1/gnome2-system-admin-guide/C/Makefile.am.orig	2005-09-01 16:45:19.463145000 +0100
-+++ gnome2-user-docs-2.8.1/gnome2-system-admin-guide/C/Makefile.am	2005-09-01 16:46:47.880810000 +0100
-@@ -15,6 +15,11 @@
- 	performance.xml		\
- 	screensavers.xml	\
- 	sessions.xml		\
-+	typeconv.xml		\
-+	sundocs.xml		\
-+	preface.xml		\
-+	mouseconv.xml		\
-+	platformnote.xml	\
- 	themes.xml
- 
- include $(top_srcdir)/xmldocs.make
---- gnome2-user-docs-2.8.1/gnome2-system-admin-guide/C/Makefile.in.orig	2005-09-01 16:45:25.143125000 +0100
-+++ gnome2-user-docs-2.8.1/gnome2-system-admin-guide/C/Makefile.in	2005-09-01 16:47:04.529255000 +0100
-@@ -185,6 +185,11 @@
- 	performance.xml		\
- 	screensavers.xml	\
- 	sessions.xml		\
-+        typeconv.xml            \
-+        sundocs.xml             \
-+        preface.xml             \
-+        mouseconv.xml           \
-+        platformnote.xml        \
- 	themes.xml
- 
- 
--- a/patches/gnome-user-docs-07-access_guide.diff	Thu Dec 08 17:09:49 2005 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
---- gnome2-user-docs-2.5.0/gnome2-accessibility-guide/C/Makefile.am.orig	2005-02-09 14:47:45.228164344 +0000
-+++ gnome2-user-docs-2.5.0/gnome2-accessibility-guide/C/Makefile.am	2005-02-09 14:48:25.070107448 +0000
-@@ -1,7 +1,7 @@
- figdir = figures
- docname = gnome-access-guide
- lang = C
--omffile = gnome-access-guide-C.omf
--entities = legal.xml accessintro.xml dtconfig.xml keynav.xml preface.xml themes.xml
-+omffile = gnome-access-guide-C.omf
-+entities = ats.xml legal.xml accessintro.xml dtconfig.xml keynav.xml mouseconv.xml platformnote.xml preface.xml themes.xml sundocs.xml sysadmin.xml typeconv.xml
- include $(top_srcdir)/xmldocs.make
- dist-hook: app-dist-hook
---- gnome2-user-docs-2.5.0/gnome2-accessibility-guide/C/Makefile.in.orig	2005-02-09 14:49:22.218419584 +0000
-+++ gnome2-user-docs-2.5.0/gnome2-accessibility-guide/C/Makefile.in	2005-02-09 14:50:09.045300816 +0000
-@@ -143,8 +143,8 @@
- figdir = figures
- docname = gnome-access-guide
- lang = C
--omffile = gnome-access-guide-C.omf
--entities = legal.xml accessintro.xml dtconfig.xml keynav.xml preface.xml themes.xml
-+omffile = gnome-access-guide-C.omf
-+entities = ats.xml legal.xml accessintro.xml dtconfig.xml keynav.xml mouseconv.xml platformnote.xml preface.xml themes.xml sundocs.xml sysadmin.xml typeconv.xml
- 
- # ************* Begin of section some packagers may need to modify  **************
- # This variable (docdir) specifies where the documents should be installed.
--- a/patches/gnome-user-docs-08-orms.diff	Thu Dec 08 17:09:49 2005 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4272 +0,0 @@
-diff -urN gnome2-user-docs-2.5.0.orig/Makefile.am gnome2-user-docs-2.5.0/Makefile.am
---- gnome2-user-docs-2.5.0.orig/Makefile.am	Thu Aug 19 15:08:21 2004
-+++ gnome2-user-docs-2.5.0/Makefile.am	Thu Aug 19 15:09:18 2004
-@@ -1,6 +1,12 @@
- SUBDIRS = \
- 	gnome2-user-guide \
- 	gnome2-accessibility-guide \
-+	javadevelop \
-+	jdsoverview \
-+	mozilla_info \
-+	office_info \
-+	online_update \
-+	sample_apps_info \
- 	gnome2-system-admin-guide
- 
- EXTRA_DIST = gnome-user-docs.spec COPYING-DOCS xmldocs.make omf.make
-diff -urN gnome2-user-docs-2.5.0.orig/configure.in gnome2-user-docs-2.5.0/configure.in
---- gnome2-user-docs-2.5.0.orig/configure.in	Thu Aug 19 15:19:32 2004
-+++ gnome2-user-docs-2.5.0/configure.in	Thu Aug 19 15:21:37 2004
-@@ -54,4 +54,16 @@
- gnome2-system-admin-guide/C/Makefile
- introduction-to-gnome/Makefile
- introduction-to-gnome/C/Makefile
-+javadevelop/Makefile
-+javadevelop/C/Makefile
-+jdsoverview/Makefile
-+jdsoverview/C/Makefile
-+mozilla_info/Makefile
-+mozilla_info/C/Makefile
-+office_info/Makefile
-+office_info/C/Makefile
-+online_update/Makefile
-+online_update/C/Makefile
-+sample_apps_info/Makefile
-+sample_apps_info/C/Makefile
- ])
-diff -urN gnome2-user-docs-2.5.0.orig/mozilla_info/C/Makefile.am gnome2-user-docs-2.5.0/mozilla_info/C/Makefile.am
---- gnome2-user-docs-2.5.0.orig/mozilla_info/C/Makefile.am	Thu Jan  1 01:00:00 1970
-+++ gnome2-user-docs-2.5.0/mozilla_info/C/Makefile.am	Thu Aug 19 14:15:55 2004
-@@ -0,0 +1,7 @@
-+figdir = 
-+docname = mozilla_info
-+lang = C
-+omffile = mozilla_info-C.omf
-+entities = legal.xml
-+include $(top_srcdir)/xmldocs.make
-+dist-hook: app-dist-hook
-diff -urN gnome2-user-docs-2.5.0.orig/mozilla_info/C/Makefile.in gnome2-user-docs-2.5.0/mozilla_info/C/Makefile.in
---- gnome2-user-docs-2.5.0.orig/mozilla_info/C/Makefile.in	Thu Jan  1 01:00:00 1970
-+++ gnome2-user-docs-2.5.0/mozilla_info/C/Makefile.in	Thu Aug 19 14:16:15 2004
-@@ -0,0 +1,359 @@
-+# Makefile.in generated by automake 1.6.3 from Makefile.am.
-+# @configure_input@
-+
-+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-+# Free Software Foundation, Inc.
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+@SET_MAKE@
-+
-+#
-+# 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)
-+#
-+
-+# 
-+# 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/lib
-+# 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/lib, 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 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)
-+#
-+SHELL = @SHELL@
-+
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+prefix = @prefix@
-+exec_prefix = @exec_prefix@
-+
-+bindir = @bindir@
-+sbindir = @sbindir@
-+libexecdir = @libexecdir@
-+datadir = @datadir@
-+sysconfdir = @sysconfdir@
-+sharedstatedir = @sharedstatedir@
-+localstatedir = @localstatedir@
-+libdir = @libdir@
-+infodir = @infodir@
-+mandir = @mandir@
-+includedir = @includedir@
-+oldincludedir = /usr/include
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../..
-+
-+ACLOCAL = @ACLOCAL@
-+AUTOCONF = @AUTOCONF@
-+AUTOMAKE = @AUTOMAKE@
-+AUTOHEADER = @AUTOHEADER@
-+
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_DATA = @INSTALL_DATA@
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = @program_transform_name@
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+
-+EXEEXT = @EXEEXT@
-+OBJEXT = @OBJEXT@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
-+AMTAR = @AMTAR@
-+AWK = @AWK@
-+DEPDIR = @DEPDIR@
-+HAVE_JW = @HAVE_JW@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+JW = @JW@
-+MAINT = @MAINT@
-+PACKAGE = @PACKAGE@
-+SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
-+SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
-+STRIP = @STRIP@
-+VERSION = @VERSION@
-+am__include = @am__include@
-+am__quote = @am__quote@
-+install_sh = @install_sh@
-+figdir = 
-+docname = mozilla_info
-+lang = C
-+omffile = mozilla_info-C.omf
-+entities = legal.xml
-+
-+# ************* 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)/@PACKAGE@/doc/$(docname)/$(lang)
-+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
-+
-+omf_dest_dir = $(datadir)/omf/@PACKAGE@
-+scrollkeeper_localstate_dir = $(localstatedir)/scrollkeeper
-+subdir = gnome2-accessibility-guide/C
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-+CONFIG_CLEAN_FILES =
-+DIST_SOURCES =
-+DIST_COMMON = Makefile.am Makefile.in
-+all: all-am
-+
-+.SUFFIXES:
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/xmldocs.make $(top_srcdir)/omf.make $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --gnu  gnome2-accessibility-guide/C/Makefile
-+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
-+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+uninstall-info-am:
-+tags: TAGS
-+TAGS:
-+
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+
-+top_distdir = ../..
-+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-+
-+distdir: $(DISTFILES)
-+	@list='$(DISTFILES)'; for file in $$list; do \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkinstalldirs) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
-+	  if test -d $$d/$$file; then \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+	  else \
-+	    test -f $(distdir)/$$file \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+	$(MAKE) $(AM_MAKEFLAGS) \
-+	  top_distdir="${top_distdir}" distdir="$(distdir)" \
-+	  dist-hook
-+check-am: all-am
-+check: check-am
-+all-am: Makefile
-+
-+installdirs:
-+
-+install: install-am
-+install-exec: install-exec-am
-+install-data: install-data-am
-+uninstall: uninstall-am
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+mostlyclean-generic:
-+
-+clean-generic:
-+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-+
-+distclean-generic:
-+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-+
-+maintainer-clean-generic:
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+clean: clean-am
-+
-+clean-am: clean-generic mostlyclean-am
-+
-+distclean: distclean-am
-+
-+distclean-am: clean-am distclean-generic
-+
-+dvi: dvi-am
-+
-+dvi-am:
-+
-+info: info-am
-+
-+info-am:
-+
-+install-data-am: install-data-local
-+	@$(NORMAL_INSTALL)
-+	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
-+
-+install-exec-am:
-+
-+install-info: install-info-am
-+
-+install-man:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-am
-+
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-generic
-+
-+uninstall-am: uninstall-info-am uninstall-local
-+
-+.PHONY: all all-am check check-am clean clean-generic distclean \
-+	distclean-generic distdir dvi dvi-am info info-am install \
-+	install-am install-data install-data-am install-data-local \
-+	install-exec install-exec-am install-info install-info-am \
-+	install-man install-strip installcheck installcheck-am \
-+	installdirs maintainer-clean maintainer-clean-generic \
-+	mostlyclean mostlyclean-generic uninstall uninstall-am \
-+	uninstall-info-am uninstall-local
-+
-+
-+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 $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
-+
-+uninstall-local-omf:
-+	-for file in $(srcdir)/*.omf; do \
-+		basefile=`basename $$file`; \
-+		rm -f $(omf_dest_dir)/$$basefile; \
-+	done
-+	-rmdir $(omf_dest_dir)
-+	-scrollkeeper-update -p $(scrollkeeper_localstate_dir)
-+
-+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 $(docdir)/$(figdir)/$$basefile; \
-+	  done; \
-+	  rmdir $(DESTDIR)$(docdir)/$(figdir); \
-+	fi
-+	-for file in $(xml_files); do \
-+	  rm -f $(DESTDIR)$(docdir)/$$file; \
-+	done
-+	-rmdir $(DESTDIR)$(docdir)
-+dist-hook: app-dist-hook
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-diff -urN gnome2-user-docs-2.5.0.orig/mozilla_info/Makefile.am gnome2-user-docs-2.5.0/mozilla_info/Makefile.am
---- gnome2-user-docs-2.5.0.orig/mozilla_info/Makefile.am	Thu Jan  1 01:00:00 1970
-+++ gnome2-user-docs-2.5.0/mozilla_info/Makefile.am	Thu Aug 19 14:06:41 2004
-@@ -0,0 +1,2 @@
-+SUBDIRS = C
-+
-diff -urN gnome2-user-docs-2.5.0.orig/mozilla_info/Makefile.in gnome2-user-docs-2.5.0/mozilla_info/Makefile.in
---- gnome2-user-docs-2.5.0.orig/mozilla_info/Makefile.in	Thu Jan  1 01:00:00 1970
-+++ gnome2-user-docs-2.5.0/mozilla_info/Makefile.in	Thu Aug 19 14:06:41 2004
-@@ -0,0 +1,322 @@
-+# Makefile.in generated by automake 1.6.3 from Makefile.am.
-+# @configure_input@
-+
-+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-+# Free Software Foundation, Inc.
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+@SET_MAKE@
-+SHELL = @SHELL@
-+
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+prefix = @prefix@
-+exec_prefix = @exec_prefix@
-+
-+bindir = @bindir@
-+sbindir = @sbindir@
-+libexecdir = @libexecdir@
-+datadir = @datadir@
-+sysconfdir = @sysconfdir@
-+sharedstatedir = @sharedstatedir@
-+localstatedir = @localstatedir@
-+libdir = @libdir@
-+infodir = @infodir@
-+mandir = @mandir@
-+includedir = @includedir@
-+oldincludedir = /usr/include
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ..
-+
-+ACLOCAL = @ACLOCAL@
-+AUTOCONF = @AUTOCONF@
-+AUTOMAKE = @AUTOMAKE@
-+AUTOHEADER = @AUTOHEADER@
-+
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_DATA = @INSTALL_DATA@
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = @program_transform_name@
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+
-+EXEEXT = @EXEEXT@
-+OBJEXT = @OBJEXT@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
-+AMTAR = @AMTAR@
-+AWK = @AWK@
-+DEPDIR = @DEPDIR@
-+HAVE_JW = @HAVE_JW@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+JW = @JW@
-+MAINT = @MAINT@
-+PACKAGE = @PACKAGE@
-+SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
-+SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
-+STRIP = @STRIP@
-+VERSION = @VERSION@
-+am__include = @am__include@
-+am__quote = @am__quote@
-+install_sh = @install_sh@
-+SUBDIRS = C
-+subdir = gnome2-accessibility-guide
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-+CONFIG_CLEAN_FILES =
-+DIST_SOURCES =
-+
-+RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
-+	uninstall-info-recursive all-recursive install-data-recursive \
-+	install-exec-recursive installdirs-recursive install-recursive \
-+	uninstall-recursive check-recursive installcheck-recursive
-+DIST_COMMON = Makefile.am Makefile.in
-+DIST_SUBDIRS = $(SUBDIRS)
-+all: all-recursive
-+
-+.SUFFIXES:
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --gnu  gnome2-accessibility-guide/Makefile
-+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
-+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+uninstall-info-am:
-+
-+# This directory's subdirectories are mostly independent; you can cd
-+# into them and run `make' without going through this Makefile.
-+# To change the values of `make' variables: instead of editing Makefiles,
-+# (1) if the variable is set in `config.status', edit `config.status'
-+#     (which will cause the Makefiles to be regenerated when you run `make');
-+# (2) otherwise, pass the desired values on the `make' command line.
-+$(RECURSIVE_TARGETS):
-+	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	dot_seen=no; \
-+	target=`echo $@ | sed s/-recursive//`; \
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  echo "Making $$target in $$subdir"; \
-+	  if test "$$subdir" = "."; then \
-+	    dot_seen=yes; \
-+	    local_target="$$target-am"; \
-+	  else \
-+	    local_target="$$target"; \
-+	  fi; \
-+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	done; \
-+	if test "$$dot_seen" = "no"; then \
-+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-+	fi; test -z "$$fail"
-+
-+mostlyclean-recursive clean-recursive distclean-recursive \
-+maintainer-clean-recursive:
-+	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	dot_seen=no; \
-+	case "$@" in \
-+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-+	  *) list='$(SUBDIRS)' ;; \
-+	esac; \
-+	rev=''; for subdir in $$list; do \
-+	  if test "$$subdir" = "."; then :; else \
-+	    rev="$$subdir $$rev"; \
-+	  fi; \
-+	done; \
-+	rev="$$rev ."; \
-+	target=`echo $@ | sed s/-recursive//`; \
-+	for subdir in $$rev; do \
-+	  echo "Making $$target in $$subdir"; \
-+	  if test "$$subdir" = "."; then \
-+	    local_target="$$target-am"; \
-+	  else \
-+	    local_target="$$target"; \
-+	  fi; \
-+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	done && test -z "$$fail"
-+tags-recursive:
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-+	done
-+
-+ETAGS = etags
-+ETAGSFLAGS =
-+
-+tags: TAGS
-+
-+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	mkid -fID $$unique
-+
-+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  if test "$$subdir" = .; then :; else \
-+	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-+	  fi; \
-+	done; \
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-+	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	     $$tags $$unique
-+
-+GTAGS:
-+	here=`$(am__cd) $(top_builddir) && pwd` \
-+	  && cd $(top_srcdir) \
-+	  && gtags -i $(GTAGS_ARGS) $$here
-+
-+distclean-tags:
-+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+
-+top_distdir = ..
-+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-+
-+distdir: $(DISTFILES)
-+	@list='$(DISTFILES)'; for file in $$list; do \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkinstalldirs) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
-+	  if test -d $$d/$$file; then \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+	  else \
-+	    test -f $(distdir)/$$file \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  if test "$$subdir" = .; then :; else \
-+	    test -d $(distdir)/$$subdir \
-+	    || mkdir $(distdir)/$$subdir \
-+	    || exit 1; \
-+	    (cd $$subdir && \
-+	      $(MAKE) $(AM_MAKEFLAGS) \
-+	        top_distdir="$(top_distdir)" \
-+	        distdir=../$(distdir)/$$subdir \
-+	        distdir) \
-+	      || exit 1; \
-+	  fi; \
-+	done
-+check-am: all-am
-+check: check-recursive
-+all-am: Makefile
-+installdirs: installdirs-recursive
-+installdirs-am:
-+
-+install: install-recursive
-+install-exec: install-exec-recursive
-+install-data: install-data-recursive
-+uninstall: uninstall-recursive
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-recursive
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-+
-+maintainer-clean-generic:
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+clean: clean-recursive
-+
-+clean-am: clean-generic mostlyclean-am
-+
-+distclean: distclean-recursive
-+
-+distclean-am: clean-am distclean-generic distclean-tags
-+
-+dvi: dvi-recursive
-+
-+dvi-am:
-+
-+info: info-recursive
-+
-+info-am:
-+
-+install-data-am:
-+
-+install-exec-am:
-+
-+install-info: install-info-recursive
-+
-+install-man:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-recursive
-+
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-recursive
-+
-+mostlyclean-am: mostlyclean-generic
-+
-+uninstall-am: uninstall-info-am
-+
-+uninstall-info: uninstall-info-recursive
-+
-+.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
-+	clean-generic clean-recursive distclean distclean-generic \
-+	distclean-recursive distclean-tags distdir dvi dvi-am \
-+	dvi-recursive info info-am info-recursive install install-am \
-+	install-data install-data-am install-data-recursive \
-+	install-exec install-exec-am install-exec-recursive \
-+	install-info install-info-am install-info-recursive install-man \
-+	install-recursive install-strip installcheck installcheck-am \
-+	installdirs installdirs-am installdirs-recursive \
-+	maintainer-clean maintainer-clean-generic \
-+	maintainer-clean-recursive mostlyclean mostlyclean-generic \
-+	mostlyclean-recursive tags tags-recursive uninstall \
-+	uninstall-am uninstall-info-am uninstall-info-recursive \
-+	uninstall-recursive
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-diff -urN gnome2-user-docs-2.5.0.orig/office_info/C/Makefile.am gnome2-user-docs-2.5.0/office_info/C/Makefile.am
---- gnome2-user-docs-2.5.0.orig/office_info/C/Makefile.am	Thu Jan  1 01:00:00 1970
-+++ gnome2-user-docs-2.5.0/office_info/C/Makefile.am	Thu Aug 19 14:14:26 2004
-@@ -0,0 +1,7 @@
-+figdir = 
-+docname = office_info
-+lang = C
-+omffile = office_info-C.omf
-+entities = legal.xml
-+include $(top_srcdir)/xmldocs.make
-+dist-hook: app-dist-hook
-diff -urN gnome2-user-docs-2.5.0.orig/office_info/C/Makefile.in gnome2-user-docs-2.5.0/office_info/C/Makefile.in
---- gnome2-user-docs-2.5.0.orig/office_info/C/Makefile.in	Thu Jan  1 01:00:00 1970
-+++ gnome2-user-docs-2.5.0/office_info/C/Makefile.in	Thu Aug 19 14:15:15 2004
-@@ -0,0 +1,359 @@
-+# Makefile.in generated by automake 1.6.3 from Makefile.am.
-+# @configure_input@
-+
-+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-+# Free Software Foundation, Inc.
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+@SET_MAKE@
-+
-+#
-+# 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)
-+#
-+
-+# 
-+# 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/lib
-+# 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/lib, 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 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)
-+#
-+SHELL = @SHELL@
-+
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+prefix = @prefix@
-+exec_prefix = @exec_prefix@
-+
-+bindir = @bindir@
-+sbindir = @sbindir@
-+libexecdir = @libexecdir@
-+datadir = @datadir@
-+sysconfdir = @sysconfdir@
-+sharedstatedir = @sharedstatedir@
-+localstatedir = @localstatedir@
-+libdir = @libdir@
-+infodir = @infodir@
-+mandir = @mandir@
-+includedir = @includedir@
-+oldincludedir = /usr/include
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../..
-+
-+ACLOCAL = @ACLOCAL@
-+AUTOCONF = @AUTOCONF@
-+AUTOMAKE = @AUTOMAKE@
-+AUTOHEADER = @AUTOHEADER@
-+
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_DATA = @INSTALL_DATA@
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = @program_transform_name@
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+
-+EXEEXT = @EXEEXT@
-+OBJEXT = @OBJEXT@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
-+AMTAR = @AMTAR@
-+AWK = @AWK@
-+DEPDIR = @DEPDIR@
-+HAVE_JW = @HAVE_JW@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+JW = @JW@
-+MAINT = @MAINT@
-+PACKAGE = @PACKAGE@
-+SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
-+SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
-+STRIP = @STRIP@
-+VERSION = @VERSION@
-+am__include = @am__include@
-+am__quote = @am__quote@
-+install_sh = @install_sh@
-+figdir = 
-+docname = office_info
-+lang = C
-+omffile = office_info-C.omf
-+entities = legal.xml
-+
-+# ************* 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)/@PACKAGE@/doc/$(docname)/$(lang)
-+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
-+
-+omf_dest_dir = $(datadir)/omf/@PACKAGE@
-+scrollkeeper_localstate_dir = $(localstatedir)/scrollkeeper
-+subdir = gnome2-accessibility-guide/C
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-+CONFIG_CLEAN_FILES =
-+DIST_SOURCES =
-+DIST_COMMON = Makefile.am Makefile.in
-+all: all-am
-+
-+.SUFFIXES:
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/xmldocs.make $(top_srcdir)/omf.make $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --gnu  gnome2-accessibility-guide/C/Makefile
-+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
-+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+uninstall-info-am:
-+tags: TAGS
-+TAGS:
-+
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+
-+top_distdir = ../..
-+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-+
-+distdir: $(DISTFILES)
-+	@list='$(DISTFILES)'; for file in $$list; do \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkinstalldirs) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
-+	  if test -d $$d/$$file; then \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+	  else \
-+	    test -f $(distdir)/$$file \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+	$(MAKE) $(AM_MAKEFLAGS) \
-+	  top_distdir="${top_distdir}" distdir="$(distdir)" \
-+	  dist-hook
-+check-am: all-am
-+check: check-am
-+all-am: Makefile
-+
-+installdirs:
-+
-+install: install-am
-+install-exec: install-exec-am
-+install-data: install-data-am
-+uninstall: uninstall-am
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+mostlyclean-generic:
-+
-+clean-generic:
-+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-+
-+distclean-generic:
-+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-+
-+maintainer-clean-generic:
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+clean: clean-am
-+
-+clean-am: clean-generic mostlyclean-am
-+
-+distclean: distclean-am
-+
-+distclean-am: clean-am distclean-generic
-+
-+dvi: dvi-am
-+
-+dvi-am:
-+
-+info: info-am
-+
-+info-am:
-+
-+install-data-am: install-data-local
-+	@$(NORMAL_INSTALL)
-+	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
-+
-+install-exec-am:
-+
-+install-info: install-info-am
-+
-+install-man:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-am
-+
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-generic
-+
-+uninstall-am: uninstall-info-am uninstall-local
-+
-+.PHONY: all all-am check check-am clean clean-generic distclean \
-+	distclean-generic distdir dvi dvi-am info info-am install \
-+	install-am install-data install-data-am install-data-local \
-+	install-exec install-exec-am install-info install-info-am \
-+	install-man install-strip installcheck installcheck-am \
-+	installdirs maintainer-clean maintainer-clean-generic \
-+	mostlyclean mostlyclean-generic uninstall uninstall-am \
-+	uninstall-info-am uninstall-local
-+
-+
-+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 $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
-+
-+uninstall-local-omf:
-+	-for file in $(srcdir)/*.omf; do \
-+		basefile=`basename $$file`; \
-+		rm -f $(omf_dest_dir)/$$basefile; \
-+	done
-+	-rmdir $(omf_dest_dir)
-+	-scrollkeeper-update -p $(scrollkeeper_localstate_dir)
-+
-+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 $(docdir)/$(figdir)/$$basefile; \
-+	  done; \
-+	  rmdir $(DESTDIR)$(docdir)/$(figdir); \
-+	fi
-+	-for file in $(xml_files); do \
-+	  rm -f $(DESTDIR)$(docdir)/$$file; \
-+	done
-+	-rmdir $(DESTDIR)$(docdir)
-+dist-hook: app-dist-hook
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-diff -urN gnome2-user-docs-2.5.0.orig/office_info/Makefile.am gnome2-user-docs-2.5.0/office_info/Makefile.am
---- gnome2-user-docs-2.5.0.orig/office_info/Makefile.am	Thu Jan  1 01:00:00 1970
-+++ gnome2-user-docs-2.5.0/office_info/Makefile.am	Thu Aug 19 14:06:47 2004
-@@ -0,0 +1,2 @@
-+SUBDIRS = C
-+
-diff -urN gnome2-user-docs-2.5.0.orig/office_info/Makefile.in gnome2-user-docs-2.5.0/office_info/Makefile.in
---- gnome2-user-docs-2.5.0.orig/office_info/Makefile.in	Thu Jan  1 01:00:00 1970
-+++ gnome2-user-docs-2.5.0/office_info/Makefile.in	Thu Aug 19 14:06:47 2004
-@@ -0,0 +1,322 @@
-+# Makefile.in generated by automake 1.6.3 from Makefile.am.
-+# @configure_input@
-+
-+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-+# Free Software Foundation, Inc.
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+@SET_MAKE@
-+SHELL = @SHELL@
-+
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+prefix = @prefix@
-+exec_prefix = @exec_prefix@
-+
-+bindir = @bindir@
-+sbindir = @sbindir@
-+libexecdir = @libexecdir@
-+datadir = @datadir@
-+sysconfdir = @sysconfdir@
-+sharedstatedir = @sharedstatedir@
-+localstatedir = @localstatedir@
-+libdir = @libdir@
-+infodir = @infodir@
-+mandir = @mandir@
-+includedir = @includedir@
-+oldincludedir = /usr/include
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ..
-+
-+ACLOCAL = @ACLOCAL@
-+AUTOCONF = @AUTOCONF@
-+AUTOMAKE = @AUTOMAKE@
-+AUTOHEADER = @AUTOHEADER@
-+
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_DATA = @INSTALL_DATA@
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = @program_transform_name@
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+
-+EXEEXT = @EXEEXT@
-+OBJEXT = @OBJEXT@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
-+AMTAR = @AMTAR@
-+AWK = @AWK@
-+DEPDIR = @DEPDIR@
-+HAVE_JW = @HAVE_JW@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+JW = @JW@
-+MAINT = @MAINT@
-+PACKAGE = @PACKAGE@
-+SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
-+SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
-+STRIP = @STRIP@
-+VERSION = @VERSION@
-+am__include = @am__include@
-+am__quote = @am__quote@
-+install_sh = @install_sh@
-+SUBDIRS = C
-+subdir = gnome2-accessibility-guide
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-+CONFIG_CLEAN_FILES =
-+DIST_SOURCES =
-+
-+RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
-+	uninstall-info-recursive all-recursive install-data-recursive \
-+	install-exec-recursive installdirs-recursive install-recursive \
-+	uninstall-recursive check-recursive installcheck-recursive
-+DIST_COMMON = Makefile.am Makefile.in
-+DIST_SUBDIRS = $(SUBDIRS)
-+all: all-recursive
-+
-+.SUFFIXES:
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --gnu  gnome2-accessibility-guide/Makefile
-+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
-+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+uninstall-info-am:
-+
-+# This directory's subdirectories are mostly independent; you can cd
-+# into them and run `make' without going through this Makefile.
-+# To change the values of `make' variables: instead of editing Makefiles,
-+# (1) if the variable is set in `config.status', edit `config.status'
-+#     (which will cause the Makefiles to be regenerated when you run `make');
-+# (2) otherwise, pass the desired values on the `make' command line.
-+$(RECURSIVE_TARGETS):
-+	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	dot_seen=no; \
-+	target=`echo $@ | sed s/-recursive//`; \
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  echo "Making $$target in $$subdir"; \
-+	  if test "$$subdir" = "."; then \
-+	    dot_seen=yes; \
-+	    local_target="$$target-am"; \
-+	  else \
-+	    local_target="$$target"; \
-+	  fi; \
-+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	done; \
-+	if test "$$dot_seen" = "no"; then \
-+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-+	fi; test -z "$$fail"
-+
-+mostlyclean-recursive clean-recursive distclean-recursive \
-+maintainer-clean-recursive:
-+	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	dot_seen=no; \
-+	case "$@" in \
-+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-+	  *) list='$(SUBDIRS)' ;; \
-+	esac; \
-+	rev=''; for subdir in $$list; do \
-+	  if test "$$subdir" = "."; then :; else \
-+	    rev="$$subdir $$rev"; \
-+	  fi; \
-+	done; \
-+	rev="$$rev ."; \
-+	target=`echo $@ | sed s/-recursive//`; \
-+	for subdir in $$rev; do \
-+	  echo "Making $$target in $$subdir"; \
-+	  if test "$$subdir" = "."; then \
-+	    local_target="$$target-am"; \
-+	  else \
-+	    local_target="$$target"; \
-+	  fi; \
-+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	done && test -z "$$fail"
-+tags-recursive:
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-+	done
-+
-+ETAGS = etags
-+ETAGSFLAGS =
-+
-+tags: TAGS
-+
-+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	mkid -fID $$unique
-+
-+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  if test "$$subdir" = .; then :; else \
-+	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-+	  fi; \
-+	done; \
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-+	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	     $$tags $$unique
-+
-+GTAGS:
-+	here=`$(am__cd) $(top_builddir) && pwd` \
-+	  && cd $(top_srcdir) \
-+	  && gtags -i $(GTAGS_ARGS) $$here
-+
-+distclean-tags:
-+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+
-+top_distdir = ..
-+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-+
-+distdir: $(DISTFILES)
-+	@list='$(DISTFILES)'; for file in $$list; do \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkinstalldirs) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
-+	  if test -d $$d/$$file; then \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+	  else \
-+	    test -f $(distdir)/$$file \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  if test "$$subdir" = .; then :; else \
-+	    test -d $(distdir)/$$subdir \
-+	    || mkdir $(distdir)/$$subdir \
-+	    || exit 1; \
-+	    (cd $$subdir && \
-+	      $(MAKE) $(AM_MAKEFLAGS) \
-+	        top_distdir="$(top_distdir)" \
-+	        distdir=../$(distdir)/$$subdir \
-+	        distdir) \
-+	      || exit 1; \
-+	  fi; \
-+	done
-+check-am: all-am
-+check: check-recursive
-+all-am: Makefile
-+installdirs: installdirs-recursive
-+installdirs-am:
-+
-+install: install-recursive
-+install-exec: install-exec-recursive
-+install-data: install-data-recursive
-+uninstall: uninstall-recursive
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-recursive
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-+
-+maintainer-clean-generic:
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+clean: clean-recursive
-+
-+clean-am: clean-generic mostlyclean-am
-+
-+distclean: distclean-recursive
-+
-+distclean-am: clean-am distclean-generic distclean-tags
-+
-+dvi: dvi-recursive
-+
-+dvi-am:
-+
-+info: info-recursive
-+
-+info-am:
-+
-+install-data-am:
-+
-+install-exec-am:
-+
-+install-info: install-info-recursive
-+
-+install-man:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-recursive
-+
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-recursive
-+
-+mostlyclean-am: mostlyclean-generic
-+
-+uninstall-am: uninstall-info-am
-+
-+uninstall-info: uninstall-info-recursive
-+
-+.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
-+	clean-generic clean-recursive distclean distclean-generic \
-+	distclean-recursive distclean-tags distdir dvi dvi-am \
-+	dvi-recursive info info-am info-recursive install install-am \
-+	install-data install-data-am install-data-recursive \
-+	install-exec install-exec-am install-exec-recursive \
-+	install-info install-info-am install-info-recursive install-man \
-+	install-recursive install-strip installcheck installcheck-am \
-+	installdirs installdirs-am installdirs-recursive \
-+	maintainer-clean maintainer-clean-generic \
-+	maintainer-clean-recursive mostlyclean mostlyclean-generic \
-+	mostlyclean-recursive tags tags-recursive uninstall \
-+	uninstall-am uninstall-info-am uninstall-info-recursive \
-+	uninstall-recursive
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-diff -urN gnome2-user-docs-2.5.0.orig/sample_apps_info/C/Makefile.am gnome2-user-docs-2.5.0/sample_apps_info/C/Makefile.am
---- gnome2-user-docs-2.5.0.orig/sample_apps_info/C/Makefile.am	Thu Jan  1 01:00:00 1970
-+++ gnome2-user-docs-2.5.0/sample_apps_info/C/Makefile.am	Thu Aug 19 14:17:13 2004
-@@ -0,0 +1,7 @@
-+figdir = 
-+docname = sample_apps_info
-+lang = C
-+omffile = acroread-C.omf gimp-C.omf gnome-games-C.omf gthumb-C.omf java-web-start-C.omf jdictionary-C.omf jdiskreport-C.omf jedit-C.omf jgraphpad-C.omf planner-C.omf realplay-C.omf sun-java-im-C.omf
-+entities = legal.xml
-+include $(top_srcdir)/xmldocs.make
-+dist-hook: app-dist-hook
-diff -urN gnome2-user-docs-2.5.0.orig/sample_apps_info/C/Makefile.in gnome2-user-docs-2.5.0/sample_apps_info/C/Makefile.in
---- gnome2-user-docs-2.5.0.orig/sample_apps_info/C/Makefile.in	Thu Jan  1 01:00:00 1970
-+++ gnome2-user-docs-2.5.0/sample_apps_info/C/Makefile.in	Thu Aug 19 14:17:51 2004
-@@ -0,0 +1,359 @@
-+# Makefile.in generated by automake 1.6.3 from Makefile.am.
-+# @configure_input@
-+
-+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-+# Free Software Foundation, Inc.
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+@SET_MAKE@
-+
-+#
-+# 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)
-+#
-+
-+# 
-+# 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/lib
-+# 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/lib, 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 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)
-+#
-+SHELL = @SHELL@
-+
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+prefix = @prefix@
-+exec_prefix = @exec_prefix@
-+
-+bindir = @bindir@
-+sbindir = @sbindir@
-+libexecdir = @libexecdir@
-+datadir = @datadir@
-+sysconfdir = @sysconfdir@
-+sharedstatedir = @sharedstatedir@
-+localstatedir = @localstatedir@
-+libdir = @libdir@
-+infodir = @infodir@
-+mandir = @mandir@
-+includedir = @includedir@
-+oldincludedir = /usr/include
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../..
-+
-+ACLOCAL = @ACLOCAL@
-+AUTOCONF = @AUTOCONF@
-+AUTOMAKE = @AUTOMAKE@
-+AUTOHEADER = @AUTOHEADER@
-+
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_DATA = @INSTALL_DATA@
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = @program_transform_name@
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+
-+EXEEXT = @EXEEXT@
-+OBJEXT = @OBJEXT@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
-+AMTAR = @AMTAR@
-+AWK = @AWK@
-+DEPDIR = @DEPDIR@
-+HAVE_JW = @HAVE_JW@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+JW = @JW@
-+MAINT = @MAINT@
-+PACKAGE = @PACKAGE@
-+SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
-+SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
-+STRIP = @STRIP@
-+VERSION = @VERSION@
-+am__include = @am__include@
-+am__quote = @am__quote@
-+install_sh = @install_sh@
-+figdir = 
-+docname = sample_apps_info
-+lang = C
-+omffile = acroread-C.omf
-+entities = legal.xml
-+
-+# ************* 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)/@PACKAGE@/doc/$(docname)/$(lang)
-+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
-+
-+omf_dest_dir = $(datadir)/omf/@PACKAGE@
-+scrollkeeper_localstate_dir = $(localstatedir)/scrollkeeper
-+subdir = gnome2-accessibility-guide/C
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-+CONFIG_CLEAN_FILES =
-+DIST_SOURCES =
-+DIST_COMMON = Makefile.am Makefile.in
-+all: all-am
-+
-+.SUFFIXES:
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/xmldocs.make $(top_srcdir)/omf.make $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --gnu  gnome2-accessibility-guide/C/Makefile
-+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
-+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+uninstall-info-am:
-+tags: TAGS
-+TAGS:
-+
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+
-+top_distdir = ../..
-+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-+
-+distdir: $(DISTFILES)
-+	@list='$(DISTFILES)'; for file in $$list; do \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkinstalldirs) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
-+	  if test -d $$d/$$file; then \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+	  else \
-+	    test -f $(distdir)/$$file \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+	$(MAKE) $(AM_MAKEFLAGS) \
-+	  top_distdir="${top_distdir}" distdir="$(distdir)" \
-+	  dist-hook
-+check-am: all-am
-+check: check-am
-+all-am: Makefile
-+
-+installdirs:
-+
-+install: install-am
-+install-exec: install-exec-am
-+install-data: install-data-am
-+uninstall: uninstall-am
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+mostlyclean-generic:
-+
-+clean-generic:
-+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-+
-+distclean-generic:
-+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-+
-+maintainer-clean-generic:
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+clean: clean-am
-+
-+clean-am: clean-generic mostlyclean-am
-+
-+distclean: distclean-am
-+
-+distclean-am: clean-am distclean-generic
-+
-+dvi: dvi-am
-+
-+dvi-am:
-+
-+info: info-am
-+
-+info-am:
-+
-+install-data-am: install-data-local
-+	@$(NORMAL_INSTALL)
-+	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
-+
-+install-exec-am:
-+
-+install-info: install-info-am
-+
-+install-man:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-am
-+
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-generic
-+
-+uninstall-am: uninstall-info-am uninstall-local
-+
-+.PHONY: all all-am check check-am clean clean-generic distclean \
-+	distclean-generic distdir dvi dvi-am info info-am install \
-+	install-am install-data install-data-am install-data-local \
-+	install-exec install-exec-am install-info install-info-am \
-+	install-man install-strip installcheck installcheck-am \
-+	installdirs maintainer-clean maintainer-clean-generic \
-+	mostlyclean mostlyclean-generic uninstall uninstall-am \
-+	uninstall-info-am uninstall-local
-+
-+
-+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 $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
-+
-+uninstall-local-omf:
-+	-for file in $(srcdir)/*.omf; do \
-+		basefile=`basename $$file`; \
-+		rm -f $(omf_dest_dir)/$$basefile; \
-+	done
-+	-rmdir $(omf_dest_dir)
-+	-scrollkeeper-update -p $(scrollkeeper_localstate_dir)
-+
-+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 $(docdir)/$(figdir)/$$basefile; \
-+	  done; \
-+	  rmdir $(DESTDIR)$(docdir)/$(figdir); \
-+	fi
-+	-for file in $(xml_files); do \
-+	  rm -f $(DESTDIR)$(docdir)/$$file; \
-+	done
-+	-rmdir $(DESTDIR)$(docdir)
-+dist-hook: app-dist-hook
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-diff -urN gnome2-user-docs-2.5.0.orig/sample_apps_info/Makefile.am gnome2-user-docs-2.5.0/sample_apps_info/Makefile.am
---- gnome2-user-docs-2.5.0.orig/sample_apps_info/Makefile.am	Thu Jan  1 01:00:00 1970
-+++ gnome2-user-docs-2.5.0/sample_apps_info/Makefile.am	Thu Aug 19 14:06:54 2004
-@@ -0,0 +1,2 @@
-+SUBDIRS = C
-+
-diff -urN gnome2-user-docs-2.5.0.orig/sample_apps_info/Makefile.in gnome2-user-docs-2.5.0/sample_apps_info/Makefile.in
---- gnome2-user-docs-2.5.0.orig/sample_apps_info/Makefile.in	Thu Jan  1 01:00:00 1970
-+++ gnome2-user-docs-2.5.0/sample_apps_info/Makefile.in	Thu Aug 19 14:06:54 2004
-@@ -0,0 +1,322 @@
-+# Makefile.in generated by automake 1.6.3 from Makefile.am.
-+# @configure_input@
-+
-+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-+# Free Software Foundation, Inc.
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+@SET_MAKE@
-+SHELL = @SHELL@
-+
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+prefix = @prefix@
-+exec_prefix = @exec_prefix@
-+
-+bindir = @bindir@
-+sbindir = @sbindir@
-+libexecdir = @libexecdir@
-+datadir = @datadir@
-+sysconfdir = @sysconfdir@
-+sharedstatedir = @sharedstatedir@
-+localstatedir = @localstatedir@
-+libdir = @libdir@
-+infodir = @infodir@
-+mandir = @mandir@
-+includedir = @includedir@
-+oldincludedir = /usr/include
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ..
-+
-+ACLOCAL = @ACLOCAL@
-+AUTOCONF = @AUTOCONF@
-+AUTOMAKE = @AUTOMAKE@
-+AUTOHEADER = @AUTOHEADER@
-+
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_DATA = @INSTALL_DATA@
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = @program_transform_name@
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+
-+EXEEXT = @EXEEXT@
-+OBJEXT = @OBJEXT@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
-+AMTAR = @AMTAR@
-+AWK = @AWK@
-+DEPDIR = @DEPDIR@
-+HAVE_JW = @HAVE_JW@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+JW = @JW@
-+MAINT = @MAINT@
-+PACKAGE = @PACKAGE@
-+SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
-+SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
-+STRIP = @STRIP@
-+VERSION = @VERSION@
-+am__include = @am__include@
-+am__quote = @am__quote@
-+install_sh = @install_sh@
-+SUBDIRS = C
-+subdir = gnome2-accessibility-guide
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-+CONFIG_CLEAN_FILES =
-+DIST_SOURCES =
-+
-+RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
-+	uninstall-info-recursive all-recursive install-data-recursive \
-+	install-exec-recursive installdirs-recursive install-recursive \
-+	uninstall-recursive check-recursive installcheck-recursive
-+DIST_COMMON = Makefile.am Makefile.in
-+DIST_SUBDIRS = $(SUBDIRS)
-+all: all-recursive
-+
-+.SUFFIXES:
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --gnu  gnome2-accessibility-guide/Makefile
-+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
-+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+uninstall-info-am:
-+
-+# This directory's subdirectories are mostly independent; you can cd
-+# into them and run `make' without going through this Makefile.
-+# To change the values of `make' variables: instead of editing Makefiles,
-+# (1) if the variable is set in `config.status', edit `config.status'
-+#     (which will cause the Makefiles to be regenerated when you run `make');
-+# (2) otherwise, pass the desired values on the `make' command line.
-+$(RECURSIVE_TARGETS):
-+	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	dot_seen=no; \
-+	target=`echo $@ | sed s/-recursive//`; \
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  echo "Making $$target in $$subdir"; \
-+	  if test "$$subdir" = "."; then \
-+	    dot_seen=yes; \
-+	    local_target="$$target-am"; \
-+	  else \
-+	    local_target="$$target"; \
-+	  fi; \
-+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	done; \
-+	if test "$$dot_seen" = "no"; then \
-+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-+	fi; test -z "$$fail"
-+
-+mostlyclean-recursive clean-recursive distclean-recursive \
-+maintainer-clean-recursive:
-+	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	dot_seen=no; \
-+	case "$@" in \
-+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-+	  *) list='$(SUBDIRS)' ;; \
-+	esac; \
-+	rev=''; for subdir in $$list; do \
-+	  if test "$$subdir" = "."; then :; else \
-+	    rev="$$subdir $$rev"; \
-+	  fi; \
-+	done; \
-+	rev="$$rev ."; \
-+	target=`echo $@ | sed s/-recursive//`; \
-+	for subdir in $$rev; do \
-+	  echo "Making $$target in $$subdir"; \
-+	  if test "$$subdir" = "."; then \
-+	    local_target="$$target-am"; \
-+	  else \
-+	    local_target="$$target"; \
-+	  fi; \
-+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	done && test -z "$$fail"
-+tags-recursive:
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-+	done
-+
-+ETAGS = etags
-+ETAGSFLAGS =
-+
-+tags: TAGS
-+
-+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	mkid -fID $$unique
-+
-+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  if test "$$subdir" = .; then :; else \
-+	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-+	  fi; \
-+	done; \
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-+	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	     $$tags $$unique
-+
-+GTAGS:
-+	here=`$(am__cd) $(top_builddir) && pwd` \
-+	  && cd $(top_srcdir) \
-+	  && gtags -i $(GTAGS_ARGS) $$here
-+
-+distclean-tags:
-+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+
-+top_distdir = ..
-+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-+
-+distdir: $(DISTFILES)
-+	@list='$(DISTFILES)'; for file in $$list; do \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkinstalldirs) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
-+	  if test -d $$d/$$file; then \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+	  else \
-+	    test -f $(distdir)/$$file \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  if test "$$subdir" = .; then :; else \
-+	    test -d $(distdir)/$$subdir \
-+	    || mkdir $(distdir)/$$subdir \
-+	    || exit 1; \
-+	    (cd $$subdir && \
-+	      $(MAKE) $(AM_MAKEFLAGS) \
-+	        top_distdir="$(top_distdir)" \
-+	        distdir=../$(distdir)/$$subdir \
-+	        distdir) \
-+	      || exit 1; \
-+	  fi; \
-+	done
-+check-am: all-am
-+check: check-recursive
-+all-am: Makefile
-+installdirs: installdirs-recursive
-+installdirs-am:
-+
-+install: install-recursive
-+install-exec: install-exec-recursive
-+install-data: install-data-recursive
-+uninstall: uninstall-recursive
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-recursive
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-+
-+maintainer-clean-generic:
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+clean: clean-recursive
-+
-+clean-am: clean-generic mostlyclean-am
-+
-+distclean: distclean-recursive
-+
-+distclean-am: clean-am distclean-generic distclean-tags
-+
-+dvi: dvi-recursive
-+
-+dvi-am:
-+
-+info: info-recursive
-+
-+info-am:
-+
-+install-data-am:
-+
-+install-exec-am:
-+
-+install-info: install-info-recursive
-+
-+install-man:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-recursive
-+
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-recursive
-+
-+mostlyclean-am: mostlyclean-generic
-+
-+uninstall-am: uninstall-info-am
-+
-+uninstall-info: uninstall-info-recursive
-+
-+.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
-+	clean-generic clean-recursive distclean distclean-generic \
-+	distclean-recursive distclean-tags distdir dvi dvi-am \
-+	dvi-recursive info info-am info-recursive install install-am \
-+	install-data install-data-am install-data-recursive \
-+	install-exec install-exec-am install-exec-recursive \
-+	install-info install-info-am install-info-recursive install-man \
-+	install-recursive install-strip installcheck installcheck-am \
-+	installdirs installdirs-am installdirs-recursive \
-+	maintainer-clean maintainer-clean-generic \
-+	maintainer-clean-recursive mostlyclean mostlyclean-generic \
-+	mostlyclean-recursive tags tags-recursive uninstall \
-+	uninstall-am uninstall-info-am uninstall-info-recursive \
-+	uninstall-recursive
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-diff -urN gnome2-user-docs-2.5.0.orig/javadevelop/C/Makefile.am gnome2-user-docs-2.5.0/javadevelop/C/Makefile.am
---- gnome2-user-docs-2.5.0.orig/javadevelop/C/Makefile.am	Thu Jan  1 01:00:00 1970
-+++ gnome2-user-docs-2.5.0/javadevelop/C/Makefile.am	Thu Aug 19 14:17:13 2004
-@@ -0,0 +1,7 @@
-+figdir = 
-+docname = javadevelop
-+lang = C
-+omffile = javadevelop-C.omf
-+entities = legal.xml
-+include $(top_srcdir)/xmldocs.make
-+dist-hook: app-dist-hook
-diff -urN gnome2-user-docs-2.5.0.orig/javadevelop/C/Makefile.in gnome2-user-docs-2.5.0/javadevelop/C/Makefile.in
---- gnome2-user-docs-2.5.0.orig/javadevelop/C/Makefile.in	Thu Jan  1 01:00:00 1970
-+++ gnome2-user-docs-2.5.0/javadevelop/C/Makefile.in	Thu Aug 19 14:17:51 2004
-@@ -0,0 +1,359 @@
-+# Makefile.in generated by automake 1.6.3 from Makefile.am.
-+# @configure_input@
-+
-+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-+# Free Software Foundation, Inc.
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+@SET_MAKE@
-+
-+#
-+# 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)
-+#
-+
-+# 
-+# 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/lib
-+# 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/lib, 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 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)
-+#
-+SHELL = @SHELL@
-+
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+prefix = @prefix@
-+exec_prefix = @exec_prefix@
-+
-+bindir = @bindir@
-+sbindir = @sbindir@
-+libexecdir = @libexecdir@
-+datadir = @datadir@
-+sysconfdir = @sysconfdir@
-+sharedstatedir = @sharedstatedir@
-+localstatedir = @localstatedir@
-+libdir = @libdir@
-+infodir = @infodir@
-+mandir = @mandir@
-+includedir = @includedir@
-+oldincludedir = /usr/include
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../..
-+
-+ACLOCAL = @ACLOCAL@
-+AUTOCONF = @AUTOCONF@
-+AUTOMAKE = @AUTOMAKE@
-+AUTOHEADER = @AUTOHEADER@
-+
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_DATA = @INSTALL_DATA@
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = @program_transform_name@
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+
-+EXEEXT = @EXEEXT@
-+OBJEXT = @OBJEXT@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
-+AMTAR = @AMTAR@
-+AWK = @AWK@
-+DEPDIR = @DEPDIR@
-+HAVE_JW = @HAVE_JW@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+JW = @JW@
-+MAINT = @MAINT@
-+PACKAGE = @PACKAGE@
-+SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
-+SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
-+STRIP = @STRIP@
-+VERSION = @VERSION@
-+am__include = @am__include@
-+am__quote = @am__quote@
-+install_sh = @install_sh@
-+figdir = 
-+docname = javadevelop
-+lang = C
-+omffile =javadevelop-C.omf
-+entities = legal.xml
-+
-+# ************* 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)/@PACKAGE@/doc/$(docname)/$(lang)
-+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
-+
-+omf_dest_dir = $(datadir)/omf/@PACKAGE@
-+scrollkeeper_localstate_dir = $(localstatedir)/scrollkeeper
-+subdir = gnome2-accessibility-guide/C
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-+CONFIG_CLEAN_FILES =
-+DIST_SOURCES =
-+DIST_COMMON = Makefile.am Makefile.in
-+all: all-am
-+
-+.SUFFIXES:
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/xmldocs.make $(top_srcdir)/omf.make $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --gnu  gnome2-accessibility-guide/C/Makefile
-+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
-+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+uninstall-info-am:
-+tags: TAGS
-+TAGS:
-+
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+
-+top_distdir = ../..
-+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-+
-+distdir: $(DISTFILES)
-+	@list='$(DISTFILES)'; for file in $$list; do \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkinstalldirs) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
-+	  if test -d $$d/$$file; then \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+	  else \
-+	    test -f $(distdir)/$$file \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+	$(MAKE) $(AM_MAKEFLAGS) \
-+	  top_distdir="${top_distdir}" distdir="$(distdir)" \
-+	  dist-hook
-+check-am: all-am
-+check: check-am
-+all-am: Makefile
-+
-+installdirs:
-+
-+install: install-am
-+install-exec: install-exec-am
-+install-data: install-data-am
-+uninstall: uninstall-am
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+mostlyclean-generic:
-+
-+clean-generic:
-+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-+
-+distclean-generic:
-+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-+
-+maintainer-clean-generic:
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+clean: clean-am
-+
-+clean-am: clean-generic mostlyclean-am
-+
-+distclean: distclean-am
-+
-+distclean-am: clean-am distclean-generic
-+
-+dvi: dvi-am
-+
-+dvi-am:
-+
-+info: info-am
-+
-+info-am:
-+
-+install-data-am: install-data-local
-+	@$(NORMAL_INSTALL)
-+	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
-+
-+install-exec-am:
-+
-+install-info: install-info-am
-+
-+install-man:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-am
-+
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-generic
-+
-+uninstall-am: uninstall-info-am uninstall-local
-+
-+.PHONY: all all-am check check-am clean clean-generic distclean \
-+	distclean-generic distdir dvi dvi-am info info-am install \
-+	install-am install-data install-data-am install-data-local \
-+	install-exec install-exec-am install-info install-info-am \
-+	install-man install-strip installcheck installcheck-am \
-+	installdirs maintainer-clean maintainer-clean-generic \
-+	mostlyclean mostlyclean-generic uninstall uninstall-am \
-+	uninstall-info-am uninstall-local
-+
-+
-+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 $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
-+
-+uninstall-local-omf:
-+	-for file in $(srcdir)/*.omf; do \
-+		basefile=`basename $$file`; \
-+		rm -f $(omf_dest_dir)/$$basefile; \
-+	done
-+	-rmdir $(omf_dest_dir)
-+	-scrollkeeper-update -p $(scrollkeeper_localstate_dir)
-+
-+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 $(docdir)/$(figdir)/$$basefile; \
-+	  done; \
-+	  rmdir $(DESTDIR)$(docdir)/$(figdir); \
-+	fi
-+	-for file in $(xml_files); do \
-+	  rm -f $(DESTDIR)$(docdir)/$$file; \
-+	done
-+	-rmdir $(DESTDIR)$(docdir)
-+dist-hook: app-dist-hook
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-diff -urN gnome2-user-docs-2.5.0.orig/javadevelop/Makefile.am gnome2-user-docs-2.5.0/javadevelop/Makefile.am
---- gnome2-user-docs-2.5.0.orig/javadevelop/Makefile.am	Thu Jan  1 01:00:00 1970
-+++ gnome2-user-docs-2.5.0/javadevelop/Makefile.am	Thu Aug 19 14:06:54 2004
-@@ -0,0 +1,2 @@
-+SUBDIRS = C
-+
-diff -urN gnome2-user-docs-2.5.0.orig/javadevelop/Makefile.in gnome2-user-docs-2.5.0/javadevelop/Makefile.in
---- gnome2-user-docs-2.5.0.orig/javadevelop/Makefile.in	Thu Jan  1 01:00:00 1970
-+++ gnome2-user-docs-2.5.0/javadevelop/Makefile.in	Thu Aug 19 14:06:54 2004
-@@ -0,0 +1,322 @@
-+# Makefile.in generated by automake 1.6.3 from Makefile.am.
-+# @configure_input@
-+
-+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-+# Free Software Foundation, Inc.
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+@SET_MAKE@
-+SHELL = @SHELL@
-+
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+prefix = @prefix@
-+exec_prefix = @exec_prefix@
-+
-+bindir = @bindir@
-+sbindir = @sbindir@
-+libexecdir = @libexecdir@
-+datadir = @datadir@
-+sysconfdir = @sysconfdir@
-+sharedstatedir = @sharedstatedir@
-+localstatedir = @localstatedir@
-+libdir = @libdir@
-+infodir = @infodir@
-+mandir = @mandir@
-+includedir = @includedir@
-+oldincludedir = /usr/include
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ..
-+
-+ACLOCAL = @ACLOCAL@
-+AUTOCONF = @AUTOCONF@
-+AUTOMAKE = @AUTOMAKE@
-+AUTOHEADER = @AUTOHEADER@
-+
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_DATA = @INSTALL_DATA@
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = @program_transform_name@
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+
-+EXEEXT = @EXEEXT@
-+OBJEXT = @OBJEXT@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
-+AMTAR = @AMTAR@
-+AWK = @AWK@
-+DEPDIR = @DEPDIR@
-+HAVE_JW = @HAVE_JW@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+JW = @JW@
-+MAINT = @MAINT@
-+PACKAGE = @PACKAGE@
-+SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
-+SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
-+STRIP = @STRIP@
-+VERSION = @VERSION@
-+am__include = @am__include@
-+am__quote = @am__quote@
-+install_sh = @install_sh@
-+SUBDIRS = C
-+subdir = gnome2-accessibility-guide
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-+CONFIG_CLEAN_FILES =
-+DIST_SOURCES =
-+
-+RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
-+	uninstall-info-recursive all-recursive install-data-recursive \
-+	install-exec-recursive installdirs-recursive install-recursive \
-+	uninstall-recursive check-recursive installcheck-recursive
-+DIST_COMMON = Makefile.am Makefile.in
-+DIST_SUBDIRS = $(SUBDIRS)
-+all: all-recursive
-+
-+.SUFFIXES:
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --gnu  gnome2-accessibility-guide/Makefile
-+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
-+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+uninstall-info-am:
-+
-+# This directory's subdirectories are mostly independent; you can cd
-+# into them and run `make' without going through this Makefile.
-+# To change the values of `make' variables: instead of editing Makefiles,
-+# (1) if the variable is set in `config.status', edit `config.status'
-+#     (which will cause the Makefiles to be regenerated when you run `make');
-+# (2) otherwise, pass the desired values on the `make' command line.
-+$(RECURSIVE_TARGETS):
-+	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	dot_seen=no; \
-+	target=`echo $@ | sed s/-recursive//`; \
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  echo "Making $$target in $$subdir"; \
-+	  if test "$$subdir" = "."; then \
-+	    dot_seen=yes; \
-+	    local_target="$$target-am"; \
-+	  else \
-+	    local_target="$$target"; \
-+	  fi; \
-+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	done; \
-+	if test "$$dot_seen" = "no"; then \
-+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-+	fi; test -z "$$fail"
-+
-+mostlyclean-recursive clean-recursive distclean-recursive \
-+maintainer-clean-recursive:
-+	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	dot_seen=no; \
-+	case "$@" in \
-+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-+	  *) list='$(SUBDIRS)' ;; \
-+	esac; \
-+	rev=''; for subdir in $$list; do \
-+	  if test "$$subdir" = "."; then :; else \
-+	    rev="$$subdir $$rev"; \
-+	  fi; \
-+	done; \
-+	rev="$$rev ."; \
-+	target=`echo $@ | sed s/-recursive//`; \
-+	for subdir in $$rev; do \
-+	  echo "Making $$target in $$subdir"; \
-+	  if test "$$subdir" = "."; then \
-+	    local_target="$$target-am"; \
-+	  else \
-+	    local_target="$$target"; \
-+	  fi; \
-+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	done && test -z "$$fail"
-+tags-recursive:
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-+	done
-+
-+ETAGS = etags
-+ETAGSFLAGS =
-+
-+tags: TAGS
-+
-+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	mkid -fID $$unique
-+
-+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  if test "$$subdir" = .; then :; else \
-+	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-+	  fi; \
-+	done; \
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-+	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	     $$tags $$unique
-+
-+GTAGS:
-+	here=`$(am__cd) $(top_builddir) && pwd` \
-+	  && cd $(top_srcdir) \
-+	  && gtags -i $(GTAGS_ARGS) $$here
-+
-+distclean-tags:
-+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+
-+top_distdir = ..
-+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-+
-+distdir: $(DISTFILES)
-+	@list='$(DISTFILES)'; for file in $$list; do \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkinstalldirs) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
-+	  if test -d $$d/$$file; then \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+	  else \
-+	    test -f $(distdir)/$$file \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  if test "$$subdir" = .; then :; else \
-+	    test -d $(distdir)/$$subdir \
-+	    || mkdir $(distdir)/$$subdir \
-+	    || exit 1; \
-+	    (cd $$subdir && \
-+	      $(MAKE) $(AM_MAKEFLAGS) \
-+	        top_distdir="$(top_distdir)" \
-+	        distdir=../$(distdir)/$$subdir \
-+	        distdir) \
-+	      || exit 1; \
-+	  fi; \
-+	done
-+check-am: all-am
-+check: check-recursive
-+all-am: Makefile
-+installdirs: installdirs-recursive
-+installdirs-am:
-+
-+install: install-recursive
-+install-exec: install-exec-recursive
-+install-data: install-data-recursive
-+uninstall: uninstall-recursive
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-recursive
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-+
-+maintainer-clean-generic:
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+clean: clean-recursive
-+
-+clean-am: clean-generic mostlyclean-am
-+
-+distclean: distclean-recursive
-+
-+distclean-am: clean-am distclean-generic distclean-tags
-+
-+dvi: dvi-recursive
-+
-+dvi-am:
-+
-+info: info-recursive
-+
-+info-am:
-+
-+install-data-am:
-+
-+install-exec-am:
-+
-+install-info: install-info-recursive
-+
-+install-man:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-recursive
-+
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-recursive
-+
-+mostlyclean-am: mostlyclean-generic
-+
-+uninstall-am: uninstall-info-am
-+
-+uninstall-info: uninstall-info-recursive
-+
-+.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
-+	clean-generic clean-recursive distclean distclean-generic \
-+	distclean-recursive distclean-tags distdir dvi dvi-am \
-+	dvi-recursive info info-am info-recursive install install-am \
-+	install-data install-data-am install-data-recursive \
-+	install-exec install-exec-am install-exec-recursive \
-+	install-info install-info-am install-info-recursive install-man \
-+	install-recursive install-strip installcheck installcheck-am \
-+	installdirs installdirs-am installdirs-recursive \
-+	maintainer-clean maintainer-clean-generic \
-+	maintainer-clean-recursive mostlyclean mostlyclean-generic \
-+	mostlyclean-recursive tags tags-recursive uninstall \
-+	uninstall-am uninstall-info-am uninstall-info-recursive \
-+	uninstall-recursive
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-diff -urN gnome2-user-docs-2.5.0.orig/jdsoverview/C/Makefile.am gnome2-user-docs-2.5.0/jdsoverview/C/Makefile.am
---- gnome2-user-docs-2.5.0.orig/jdsoverview/C/Makefile.am	Thu Jan  1 01:00:00 1970
-+++ gnome2-user-docs-2.5.0/jdsoverview/C/Makefile.am	Thu Aug 19 14:17:13 2004
-@@ -0,0 +1,7 @@
-+figdir = figures
-+docname = jdsoverview
-+lang = C
-+omffile = jdsoverview-C.omf
-+entities = legal.xml
-+include $(top_srcdir)/xmldocs.make
-+dist-hook: app-dist-hook
-diff -urN gnome2-user-docs-2.5.0.orig/jdsoverview/C/Makefile.in gnome2-user-docs-2.5.0/jdsoverview/C/Makefile.in
---- gnome2-user-docs-2.5.0.orig/jdsoverview/C/Makefile.in	Thu Jan  1 01:00:00 1970
-+++ gnome2-user-docs-2.5.0/jdsoverview/C/Makefile.in	Thu Aug 19 14:17:51 2004
-@@ -0,0 +1,359 @@
-+# Makefile.in generated by automake 1.6.3 from Makefile.am.
-+# @configure_input@
-+
-+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-+# Free Software Foundation, Inc.
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+@SET_MAKE@
-+
-+#
-+# 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)
-+#
-+
-+# 
-+# 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/lib
-+# 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/lib, 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 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)
-+#
-+SHELL = @SHELL@
-+
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+prefix = @prefix@
-+exec_prefix = @exec_prefix@
-+
-+bindir = @bindir@
-+sbindir = @sbindir@
-+libexecdir = @libexecdir@
-+datadir = @datadir@
-+sysconfdir = @sysconfdir@
-+sharedstatedir = @sharedstatedir@
-+localstatedir = @localstatedir@
-+libdir = @libdir@
-+infodir = @infodir@
-+mandir = @mandir@
-+includedir = @includedir@
-+oldincludedir = /usr/include
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../..
-+
-+ACLOCAL = @ACLOCAL@
-+AUTOCONF = @AUTOCONF@
-+AUTOMAKE = @AUTOMAKE@
-+AUTOHEADER = @AUTOHEADER@
-+
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_DATA = @INSTALL_DATA@
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = @program_transform_name@
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+
-+EXEEXT = @EXEEXT@
-+OBJEXT = @OBJEXT@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
-+AMTAR = @AMTAR@
-+AWK = @AWK@
-+DEPDIR = @DEPDIR@
-+HAVE_JW = @HAVE_JW@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+JW = @JW@
-+MAINT = @MAINT@
-+PACKAGE = @PACKAGE@
-+SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
-+SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
-+STRIP = @STRIP@
-+VERSION = @VERSION@
-+am__include = @am__include@
-+am__quote = @am__quote@
-+install_sh = @install_sh@
-+figdir = figures
-+docname = jdsoverview
-+lang = C
-+omffile =jdsoverview-C.omf
-+entities = legal.xml
-+
-+# ************* 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)/@PACKAGE@/doc/$(docname)/$(lang)
-+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
-+
-+omf_dest_dir = $(datadir)/omf/@PACKAGE@
-+scrollkeeper_localstate_dir = $(localstatedir)/scrollkeeper
-+subdir = gnome2-accessibility-guide/C
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-+CONFIG_CLEAN_FILES =
-+DIST_SOURCES =
-+DIST_COMMON = Makefile.am Makefile.in
-+all: all-am
-+
-+.SUFFIXES:
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/xmldocs.make $(top_srcdir)/omf.make $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --gnu  gnome2-accessibility-guide/C/Makefile
-+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
-+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+uninstall-info-am:
-+tags: TAGS
-+TAGS:
-+
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+
-+top_distdir = ../..
-+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-+
-+distdir: $(DISTFILES)
-+	@list='$(DISTFILES)'; for file in $$list; do \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkinstalldirs) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
-+	  if test -d $$d/$$file; then \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+	  else \
-+	    test -f $(distdir)/$$file \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+	$(MAKE) $(AM_MAKEFLAGS) \
-+	  top_distdir="${top_distdir}" distdir="$(distdir)" \
-+	  dist-hook
-+check-am: all-am
-+check: check-am
-+all-am: Makefile
-+
-+installdirs:
-+
-+install: install-am
-+install-exec: install-exec-am
-+install-data: install-data-am
-+uninstall: uninstall-am
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+mostlyclean-generic:
-+
-+clean-generic:
-+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-+
-+distclean-generic:
-+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-+
-+maintainer-clean-generic:
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+clean: clean-am
-+
-+clean-am: clean-generic mostlyclean-am
-+
-+distclean: distclean-am
-+
-+distclean-am: clean-am distclean-generic
-+
-+dvi: dvi-am
-+
-+dvi-am:
-+
-+info: info-am
-+
-+info-am:
-+
-+install-data-am: install-data-local
-+	@$(NORMAL_INSTALL)
-+	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
-+
-+install-exec-am:
-+
-+install-info: install-info-am
-+
-+install-man:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-am
-+
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-generic
-+
-+uninstall-am: uninstall-info-am uninstall-local
-+
-+.PHONY: all all-am check check-am clean clean-generic distclean \
-+	distclean-generic distdir dvi dvi-am info info-am install \
-+	install-am install-data install-data-am install-data-local \
-+	install-exec install-exec-am install-info install-info-am \
-+	install-man install-strip installcheck installcheck-am \
-+	installdirs maintainer-clean maintainer-clean-generic \
-+	mostlyclean mostlyclean-generic uninstall uninstall-am \
-+	uninstall-info-am uninstall-local
-+
-+
-+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 $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
-+
-+uninstall-local-omf:
-+	-for file in $(srcdir)/*.omf; do \
-+		basefile=`basename $$file`; \
-+		rm -f $(omf_dest_dir)/$$basefile; \
-+	done
-+	-rmdir $(omf_dest_dir)
-+	-scrollkeeper-update -p $(scrollkeeper_localstate_dir)
-+
-+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 $(docdir)/$(figdir)/$$basefile; \
-+	  done; \
-+	  rmdir $(DESTDIR)$(docdir)/$(figdir); \
-+	fi
-+	-for file in $(xml_files); do \
-+	  rm -f $(DESTDIR)$(docdir)/$$file; \
-+	done
-+	-rmdir $(DESTDIR)$(docdir)
-+dist-hook: app-dist-hook
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-diff -urN gnome2-user-docs-2.5.0.orig/jdsoverview/Makefile.am gnome2-user-docs-2.5.0/jdsoverview/Makefile.am
---- gnome2-user-docs-2.5.0.orig/jdsoverview/Makefile.am	Thu Jan  1 01:00:00 1970
-+++ gnome2-user-docs-2.5.0/jdsoverview/Makefile.am	Thu Aug 19 14:06:54 2004
-@@ -0,0 +1,2 @@
-+SUBDIRS = C
-+
-diff -urN gnome2-user-docs-2.5.0.orig/jdsoverview/Makefile.in gnome2-user-docs-2.5.0/jdsoverview/Makefile.in
---- gnome2-user-docs-2.5.0.orig/jdsoverview/Makefile.in	Thu Jan  1 01:00:00 1970
-+++ gnome2-user-docs-2.5.0/jdsoverview/Makefile.in	Thu Aug 19 14:06:54 2004
-@@ -0,0 +1,322 @@
-+# Makefile.in generated by automake 1.6.3 from Makefile.am.
-+# @configure_input@
-+
-+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-+# Free Software Foundation, Inc.
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+@SET_MAKE@
-+SHELL = @SHELL@
-+
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+prefix = @prefix@
-+exec_prefix = @exec_prefix@
-+
-+bindir = @bindir@
-+sbindir = @sbindir@
-+libexecdir = @libexecdir@
-+datadir = @datadir@
-+sysconfdir = @sysconfdir@
-+sharedstatedir = @sharedstatedir@
-+localstatedir = @localstatedir@
-+libdir = @libdir@
-+infodir = @infodir@
-+mandir = @mandir@
-+includedir = @includedir@
-+oldincludedir = /usr/include
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ..
-+
-+ACLOCAL = @ACLOCAL@
-+AUTOCONF = @AUTOCONF@
-+AUTOMAKE = @AUTOMAKE@
-+AUTOHEADER = @AUTOHEADER@
-+
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_DATA = @INSTALL_DATA@
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = @program_transform_name@
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+
-+EXEEXT = @EXEEXT@
-+OBJEXT = @OBJEXT@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
-+AMTAR = @AMTAR@
-+AWK = @AWK@
-+DEPDIR = @DEPDIR@
-+HAVE_JW = @HAVE_JW@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+JW = @JW@
-+MAINT = @MAINT@
-+PACKAGE = @PACKAGE@
-+SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
-+SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
-+STRIP = @STRIP@
-+VERSION = @VERSION@
-+am__include = @am__include@
-+am__quote = @am__quote@
-+install_sh = @install_sh@
-+SUBDIRS = C
-+subdir = gnome2-accessibility-guide
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-+CONFIG_CLEAN_FILES =
-+DIST_SOURCES =
-+
-+RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
-+	uninstall-info-recursive all-recursive install-data-recursive \
-+	install-exec-recursive installdirs-recursive install-recursive \
-+	uninstall-recursive check-recursive installcheck-recursive
-+DIST_COMMON = Makefile.am Makefile.in
-+DIST_SUBDIRS = $(SUBDIRS)
-+all: all-recursive
-+
-+.SUFFIXES:
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --gnu  gnome2-accessibility-guide/Makefile
-+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
-+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+uninstall-info-am:
-+
-+# This directory's subdirectories are mostly independent; you can cd
-+# into them and run `make' without going through this Makefile.
-+# To change the values of `make' variables: instead of editing Makefiles,
-+# (1) if the variable is set in `config.status', edit `config.status'
-+#     (which will cause the Makefiles to be regenerated when you run `make');
-+# (2) otherwise, pass the desired values on the `make' command line.
-+$(RECURSIVE_TARGETS):
-+	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	dot_seen=no; \
-+	target=`echo $@ | sed s/-recursive//`; \
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  echo "Making $$target in $$subdir"; \
-+	  if test "$$subdir" = "."; then \
-+	    dot_seen=yes; \
-+	    local_target="$$target-am"; \
-+	  else \
-+	    local_target="$$target"; \
-+	  fi; \
-+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	done; \
-+	if test "$$dot_seen" = "no"; then \
-+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-+	fi; test -z "$$fail"
-+
-+mostlyclean-recursive clean-recursive distclean-recursive \
-+maintainer-clean-recursive:
-+	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	dot_seen=no; \
-+	case "$@" in \
-+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-+	  *) list='$(SUBDIRS)' ;; \
-+	esac; \
-+	rev=''; for subdir in $$list; do \
-+	  if test "$$subdir" = "."; then :; else \
-+	    rev="$$subdir $$rev"; \
-+	  fi; \
-+	done; \
-+	rev="$$rev ."; \
-+	target=`echo $@ | sed s/-recursive//`; \
-+	for subdir in $$rev; do \
-+	  echo "Making $$target in $$subdir"; \
-+	  if test "$$subdir" = "."; then \
-+	    local_target="$$target-am"; \
-+	  else \
-+	    local_target="$$target"; \
-+	  fi; \
-+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	done && test -z "$$fail"
-+tags-recursive:
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-+	done
-+
-+ETAGS = etags
-+ETAGSFLAGS =
-+
-+tags: TAGS
-+
-+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	mkid -fID $$unique
-+
-+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  if test "$$subdir" = .; then :; else \
-+	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-+	  fi; \
-+	done; \
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-+	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	     $$tags $$unique
-+
-+GTAGS:
-+	here=`$(am__cd) $(top_builddir) && pwd` \
-+	  && cd $(top_srcdir) \
-+	  && gtags -i $(GTAGS_ARGS) $$here
-+
-+distclean-tags:
-+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+
-+top_distdir = ..
-+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-+
-+distdir: $(DISTFILES)
-+	@list='$(DISTFILES)'; for file in $$list; do \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkinstalldirs) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
-+	  if test -d $$d/$$file; then \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+	  else \
-+	    test -f $(distdir)/$$file \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  if test "$$subdir" = .; then :; else \
-+	    test -d $(distdir)/$$subdir \
-+	    || mkdir $(distdir)/$$subdir \
-+	    || exit 1; \
-+	    (cd $$subdir && \
-+	      $(MAKE) $(AM_MAKEFLAGS) \
-+	        top_distdir="$(top_distdir)" \
-+	        distdir=../$(distdir)/$$subdir \
-+	        distdir) \
-+	      || exit 1; \
-+	  fi; \
-+	done
-+check-am: all-am
-+check: check-recursive
-+all-am: Makefile
-+installdirs: installdirs-recursive
-+installdirs-am:
-+
-+install: install-recursive
-+install-exec: install-exec-recursive
-+install-data: install-data-recursive
-+uninstall: uninstall-recursive
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-recursive
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-+
-+maintainer-clean-generic:
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+clean: clean-recursive
-+
-+clean-am: clean-generic mostlyclean-am
-+
-+distclean: distclean-recursive
-+
-+distclean-am: clean-am distclean-generic distclean-tags
-+
-+dvi: dvi-recursive
-+
-+dvi-am:
-+
-+info: info-recursive
-+
-+info-am:
-+
-+install-data-am:
-+
-+install-exec-am:
-+
-+install-info: install-info-recursive
-+
-+install-man:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-recursive
-+
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-recursive
-+
-+mostlyclean-am: mostlyclean-generic
-+
-+uninstall-am: uninstall-info-am
-+
-+uninstall-info: uninstall-info-recursive
-+
-+.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
-+	clean-generic clean-recursive distclean distclean-generic \
-+	distclean-recursive distclean-tags distdir dvi dvi-am \
-+	dvi-recursive info info-am info-recursive install install-am \
-+	install-data install-data-am install-data-recursive \
-+	install-exec install-exec-am install-exec-recursive \
-+	install-info install-info-am install-info-recursive install-man \
-+	install-recursive install-strip installcheck installcheck-am \
-+	installdirs installdirs-am installdirs-recursive \
-+	maintainer-clean maintainer-clean-generic \
-+	maintainer-clean-recursive mostlyclean mostlyclean-generic \
-+	mostlyclean-recursive tags tags-recursive uninstall \
-+	uninstall-am uninstall-info-am uninstall-info-recursive \
-+	uninstall-recursive
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-diff -urN gnome2-user-docs-2.5.0.orig/online_update/C/Makefile.am gnome2-user-docs-2.5.0/online_update/C/Makefile.am
---- gnome2-user-docs-2.5.0.orig/online_update/C/Makefile.am	Thu Jan  1 01:00:00 1970
-+++ gnome2-user-docs-2.5.0/online_update/C/Makefile.am	Thu Aug 19 14:17:13 2004
-@@ -0,0 +1,7 @@
-+figdir = 
-+docname = online_update
-+lang = C
-+omffile = online_update-C.omf
-+entities = legal.xml
-+include $(top_srcdir)/xmldocs.make
-+dist-hook: app-dist-hook
-diff -urN gnome2-user-docs-2.5.0.orig/online_update/C/Makefile.in gnome2-user-docs-2.5.0/online_update/C/Makefile.in
---- gnome2-user-docs-2.5.0.orig/online_update/C/Makefile.in	Thu Jan  1 01:00:00 1970
-+++ gnome2-user-docs-2.5.0/online_update/C/Makefile.in	Thu Aug 19 14:17:51 2004
-@@ -0,0 +1,359 @@
-+# Makefile.in generated by automake 1.6.3 from Makefile.am.
-+# @configure_input@
-+
-+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-+# Free Software Foundation, Inc.
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+@SET_MAKE@
-+
-+#
-+# 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)
-+#
-+
-+# 
-+# 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/lib
-+# 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/lib, 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 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)
-+#
-+SHELL = @SHELL@
-+
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+prefix = @prefix@
-+exec_prefix = @exec_prefix@
-+
-+bindir = @bindir@
-+sbindir = @sbindir@
-+libexecdir = @libexecdir@
-+datadir = @datadir@
-+sysconfdir = @sysconfdir@
-+sharedstatedir = @sharedstatedir@
-+localstatedir = @localstatedir@
-+libdir = @libdir@
-+infodir = @infodir@
-+mandir = @mandir@
-+includedir = @includedir@
-+oldincludedir = /usr/include
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ../..
-+
-+ACLOCAL = @ACLOCAL@
-+AUTOCONF = @AUTOCONF@
-+AUTOMAKE = @AUTOMAKE@
-+AUTOHEADER = @AUTOHEADER@
-+
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_DATA = @INSTALL_DATA@
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = @program_transform_name@
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+
-+EXEEXT = @EXEEXT@
-+OBJEXT = @OBJEXT@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
-+AMTAR = @AMTAR@
-+AWK = @AWK@
-+DEPDIR = @DEPDIR@
-+HAVE_JW = @HAVE_JW@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+JW = @JW@
-+MAINT = @MAINT@
-+PACKAGE = @PACKAGE@
-+SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
-+SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
-+STRIP = @STRIP@
-+VERSION = @VERSION@
-+am__include = @am__include@
-+am__quote = @am__quote@
-+install_sh = @install_sh@
-+figdir = 
-+docname = online_update
-+lang = C
-+omffile =online_update-C.omf
-+entities = legal.xml
-+
-+# ************* 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)/@PACKAGE@/doc/$(docname)/$(lang)
-+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
-+
-+omf_dest_dir = $(datadir)/omf/@PACKAGE@
-+scrollkeeper_localstate_dir = $(localstatedir)/scrollkeeper
-+subdir = gnome2-accessibility-guide/C
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-+CONFIG_CLEAN_FILES =
-+DIST_SOURCES =
-+DIST_COMMON = Makefile.am Makefile.in
-+all: all-am
-+
-+.SUFFIXES:
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/xmldocs.make $(top_srcdir)/omf.make $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --gnu  gnome2-accessibility-guide/C/Makefile
-+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
-+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+uninstall-info-am:
-+tags: TAGS
-+TAGS:
-+
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+
-+top_distdir = ../..
-+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-+
-+distdir: $(DISTFILES)
-+	@list='$(DISTFILES)'; for file in $$list; do \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkinstalldirs) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
-+	  if test -d $$d/$$file; then \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+	  else \
-+	    test -f $(distdir)/$$file \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+	$(MAKE) $(AM_MAKEFLAGS) \
-+	  top_distdir="${top_distdir}" distdir="$(distdir)" \
-+	  dist-hook
-+check-am: all-am
-+check: check-am
-+all-am: Makefile
-+
-+installdirs:
-+
-+install: install-am
-+install-exec: install-exec-am
-+install-data: install-data-am
-+uninstall: uninstall-am
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+mostlyclean-generic:
-+
-+clean-generic:
-+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-+
-+distclean-generic:
-+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-+
-+maintainer-clean-generic:
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+clean: clean-am
-+
-+clean-am: clean-generic mostlyclean-am
-+
-+distclean: distclean-am
-+
-+distclean-am: clean-am distclean-generic
-+
-+dvi: dvi-am
-+
-+dvi-am:
-+
-+info: info-am
-+
-+info-am:
-+
-+install-data-am: install-data-local
-+	@$(NORMAL_INSTALL)
-+	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
-+
-+install-exec-am:
-+
-+install-info: install-info-am
-+
-+install-man:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-am
-+
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-generic
-+
-+uninstall-am: uninstall-info-am uninstall-local
-+
-+.PHONY: all all-am check check-am clean clean-generic distclean \
-+	distclean-generic distdir dvi dvi-am info info-am install \
-+	install-am install-data install-data-am install-data-local \
-+	install-exec install-exec-am install-info install-info-am \
-+	install-man install-strip installcheck installcheck-am \
-+	installdirs maintainer-clean maintainer-clean-generic \
-+	mostlyclean mostlyclean-generic uninstall uninstall-am \
-+	uninstall-info-am uninstall-local
-+
-+
-+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 $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
-+
-+uninstall-local-omf:
-+	-for file in $(srcdir)/*.omf; do \
-+		basefile=`basename $$file`; \
-+		rm -f $(omf_dest_dir)/$$basefile; \
-+	done
-+	-rmdir $(omf_dest_dir)
-+	-scrollkeeper-update -p $(scrollkeeper_localstate_dir)
-+
-+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 $(docdir)/$(figdir)/$$basefile; \
-+	  done; \
-+	  rmdir $(DESTDIR)$(docdir)/$(figdir); \
-+	fi
-+	-for file in $(xml_files); do \
-+	  rm -f $(DESTDIR)$(docdir)/$$file; \
-+	done
-+	-rmdir $(DESTDIR)$(docdir)
-+dist-hook: app-dist-hook
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
-diff -urN gnome2-user-docs-2.5.0.orig/online_update/Makefile.am gnome2-user-docs-2.5.0/online_update/Makefile.am
---- gnome2-user-docs-2.5.0.orig/online_update/Makefile.am	Thu Jan  1 01:00:00 1970
-+++ gnome2-user-docs-2.5.0/online_update/Makefile.am	Thu Aug 19 14:06:54 2004
-@@ -0,0 +1,2 @@
-+SUBDIRS = C
-+
-diff -urN gnome2-user-docs-2.5.0.orig/online_update/Makefile.in gnome2-user-docs-2.5.0/online_update/Makefile.in
---- gnome2-user-docs-2.5.0.orig/online_update/Makefile.in	Thu Jan  1 01:00:00 1970
-+++ gnome2-user-docs-2.5.0/online_update/Makefile.in	Thu Aug 19 14:06:54 2004
-@@ -0,0 +1,322 @@
-+# Makefile.in generated by automake 1.6.3 from Makefile.am.
-+# @configure_input@
-+
-+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-+# Free Software Foundation, Inc.
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+@SET_MAKE@
-+SHELL = @SHELL@
-+
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+VPATH = @srcdir@
-+prefix = @prefix@
-+exec_prefix = @exec_prefix@
-+
-+bindir = @bindir@
-+sbindir = @sbindir@
-+libexecdir = @libexecdir@
-+datadir = @datadir@
-+sysconfdir = @sysconfdir@
-+sharedstatedir = @sharedstatedir@
-+localstatedir = @localstatedir@
-+libdir = @libdir@
-+infodir = @infodir@
-+mandir = @mandir@
-+includedir = @includedir@
-+oldincludedir = /usr/include
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+top_builddir = ..
-+
-+ACLOCAL = @ACLOCAL@
-+AUTOCONF = @AUTOCONF@
-+AUTOMAKE = @AUTOMAKE@
-+AUTOHEADER = @AUTOHEADER@
-+
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+INSTALL = @INSTALL@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_DATA = @INSTALL_DATA@
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = @program_transform_name@
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+
-+EXEEXT = @EXEEXT@
-+OBJEXT = @OBJEXT@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
-+AMTAR = @AMTAR@
-+AWK = @AWK@
-+DEPDIR = @DEPDIR@
-+HAVE_JW = @HAVE_JW@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+JW = @JW@
-+MAINT = @MAINT@
-+PACKAGE = @PACKAGE@
-+SCROLLKEEPER_CONFIG = @SCROLLKEEPER_CONFIG@
-+SCROLLKEEPER_REQUIRED = @SCROLLKEEPER_REQUIRED@
-+STRIP = @STRIP@
-+VERSION = @VERSION@
-+am__include = @am__include@
-+am__quote = @am__quote@
-+install_sh = @install_sh@
-+SUBDIRS = C
-+subdir = gnome2-accessibility-guide
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-+CONFIG_CLEAN_FILES =
-+DIST_SOURCES =
-+
-+RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
-+	uninstall-info-recursive all-recursive install-data-recursive \
-+	install-exec-recursive installdirs-recursive install-recursive \
-+	uninstall-recursive check-recursive installcheck-recursive
-+DIST_COMMON = Makefile.am Makefile.in
-+DIST_SUBDIRS = $(SUBDIRS)
-+all: all-recursive
-+
-+.SUFFIXES:
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --gnu  gnome2-accessibility-guide/Makefile
-+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
-+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+uninstall-info-am:
-+
-+# This directory's subdirectories are mostly independent; you can cd
-+# into them and run `make' without going through this Makefile.
-+# To change the values of `make' variables: instead of editing Makefiles,
-+# (1) if the variable is set in `config.status', edit `config.status'
-+#     (which will cause the Makefiles to be regenerated when you run `make');
-+# (2) otherwise, pass the desired values on the `make' command line.
-+$(RECURSIVE_TARGETS):
-+	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	dot_seen=no; \
-+	target=`echo $@ | sed s/-recursive//`; \
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  echo "Making $$target in $$subdir"; \
-+	  if test "$$subdir" = "."; then \
-+	    dot_seen=yes; \
-+	    local_target="$$target-am"; \
-+	  else \
-+	    local_target="$$target"; \
-+	  fi; \
-+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	done; \
-+	if test "$$dot_seen" = "no"; then \
-+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-+	fi; test -z "$$fail"
-+
-+mostlyclean-recursive clean-recursive distclean-recursive \
-+maintainer-clean-recursive:
-+	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	dot_seen=no; \
-+	case "$@" in \
-+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-+	  *) list='$(SUBDIRS)' ;; \
-+	esac; \
-+	rev=''; for subdir in $$list; do \
-+	  if test "$$subdir" = "."; then :; else \
-+	    rev="$$subdir $$rev"; \
-+	  fi; \
-+	done; \
-+	rev="$$rev ."; \
-+	target=`echo $@ | sed s/-recursive//`; \
-+	for subdir in $$rev; do \
-+	  echo "Making $$target in $$subdir"; \
-+	  if test "$$subdir" = "."; then \
-+	    local_target="$$target-am"; \
-+	  else \
-+	    local_target="$$target"; \
-+	  fi; \
-+	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	done && test -z "$$fail"
-+tags-recursive:
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-+	done
-+
-+ETAGS = etags
-+ETAGSFLAGS =
-+
-+tags: TAGS
-+
-+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	mkid -fID $$unique
-+
-+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  if test "$$subdir" = .; then :; else \
-+	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-+	  fi; \
-+	done; \
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	test -z "$(ETAGS_ARGS)$$tags$$unique" \
-+	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	     $$tags $$unique
-+
-+GTAGS:
-+	here=`$(am__cd) $(top_builddir) && pwd` \
-+	  && cd $(top_srcdir) \
-+	  && gtags -i $(GTAGS_ARGS) $$here
-+
-+distclean-tags:
-+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+
-+top_distdir = ..
-+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-+
-+distdir: $(DISTFILES)
-+	@list='$(DISTFILES)'; for file in $$list; do \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkinstalldirs) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
-+	  if test -d $$d/$$file; then \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-+	  else \
-+	    test -f $(distdir)/$$file \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  if test "$$subdir" = .; then :; else \
-+	    test -d $(distdir)/$$subdir \
-+	    || mkdir $(distdir)/$$subdir \
-+	    || exit 1; \
-+	    (cd $$subdir && \
-+	      $(MAKE) $(AM_MAKEFLAGS) \
-+	        top_distdir="$(top_distdir)" \
-+	        distdir=../$(distdir)/$$subdir \
-+	        distdir) \
-+	      || exit 1; \
-+	  fi; \
-+	done
-+check-am: all-am
-+check: check-recursive
-+all-am: Makefile
-+installdirs: installdirs-recursive
-+installdirs-am:
-+
-+install: install-recursive
-+install-exec: install-exec-recursive
-+install-data: install-data-recursive
-+uninstall: uninstall-recursive
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-recursive
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-+
-+maintainer-clean-generic:
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+clean: clean-recursive
-+
-+clean-am: clean-generic mostlyclean-am
-+
-+distclean: distclean-recursive
-+
-+distclean-am: clean-am distclean-generic distclean-tags
-+
-+dvi: dvi-recursive
-+
-+dvi-am:
-+
-+info: info-recursive
-+
-+info-am:
-+
-+install-data-am:
-+
-+install-exec-am:
-+
-+install-info: install-info-recursive
-+
-+install-man:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-recursive
-+
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-recursive
-+
-+mostlyclean-am: mostlyclean-generic
-+
-+uninstall-am: uninstall-info-am
-+
-+uninstall-info: uninstall-info-recursive
-+
-+.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
-+	clean-generic clean-recursive distclean distclean-generic \
-+	distclean-recursive distclean-tags distdir dvi dvi-am \
-+	dvi-recursive info info-am info-recursive install install-am \
-+	install-data install-data-am install-data-recursive \
-+	install-exec install-exec-am install-exec-recursive \
-+	install-info install-info-am install-info-recursive install-man \
-+	install-recursive install-strip installcheck installcheck-am \
-+	installdirs installdirs-am installdirs-recursive \
-+	maintainer-clean maintainer-clean-generic \
-+	maintainer-clean-recursive mostlyclean mostlyclean-generic \
-+	mostlyclean-recursive tags tags-recursive uninstall \
-+	uninstall-am uninstall-info-am uninstall-info-recursive \
-+	uninstall-recursive
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
--- a/patches/gnome-user-docs-09-linux-user-guide.diff	Thu Dec 08 17:09:49 2005 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
---- gnome2-user-docs-2.5.0/gnome2-user-guide/C/Makefile.am.orig	2005-03-10 14:23:15.877895336 +0000
-+++ gnome2-user-docs-2.5.0/gnome2-user-guide/C/Makefile.am	2005-03-10 14:26:03.876355688 +0000
-@@ -1,11 +1,12 @@
--wgos_files = wgosbasic.xml wgoscustaccess.xml wgoscustdesk.xml wgoscustlookandfeel.xml wgosdeskback.xml wgoseditmainmenu.xml wgosmetacity.xml wgosnautilus.xml wgosoverview.xml wgospanel.xml wgosstartsession.xml
- 
--entities = legal.xml glossary.xml gosbasic.xml goscustaccess.xml goscustdesk.xml goscustlookandfeel.xml gosdeskback.xml goseditmainmenu.xml gosmetacity.xml gosnautilus.xml gosoverview.xml gospanel.xml gosstartsession.xml part1.xml part2.xml $(wgos_files)
-+entities = legal.xml glossary.xml goscustdesk.xml gosdeskback.xml goseditmainmenu.xml gosmetacity.xml gosnautilus.xml gospanel.xml gosstartsession.xml appendix.xml appendixa.xml preface.xml sundocs.xml typeconv.xml mouseconv.xml platformnote.xml
- 
- figdir = figures
- docname = user-guide
- lang = C
- omffile = user-guide-C.omf
-+# other_omffile's are not processed by scrollkeeper-preinstall.
-+other_omffile = floppy-formatter-C.omf force-quit-C.omf lock-C.omf log-out-C.omf network-places-C.omf new-login-C.omf new-login-nested-C.omf notification-area-C.omf run-C.omf screenshot-C.omf show-desktop-C.omf window-selector-C.omf
- 
- include $(top_srcdir)/xmldocs.make
- 
-@@ -13,5 +14,3 @@
- 
- dist-hook: app-dist-hook
- 
--$(wgos_files):
--	ln -sf user-guide.xml $@
---- gnome2-user-docs-2.5.0/xmldocs.make.orig	2005-03-11 13:26:45.685502048 +0000
-+++ gnome2-user-docs-2.5.0/xmldocs.make	2005-03-11 13:26:56.108917448 +0000
-@@ -42,7 +42,7 @@
- # **************  You should not have to edit below this line  *******************
- xml_files = $(entities) $(docname).xml
- 
--EXTRA_DIST = $(xml_files) $(omffile)
-+EXTRA_DIST = $(xml_files) $(omffile) $(other_omffile)
- CLEANFILES = omf_timestamp
- 
- include $(top_srcdir)/omf.make
---- gnome2-user-docs-2.5.0/omf.make.orig	2005-03-22 17:35:25.180006928 +0000
-+++ gnome2-user-docs-2.5.0/omf.make	2005-03-22 17:41:47.367905536 +0000
-@@ -29,17 +29,25 @@
- omf_dest_dir=$(datadir)/omf/@PACKAGE@
- scrollkeeper_localstate_dir = $(localstatedir)/scrollkeeper
- 
-+# Really need to have some way of escaping all the '/' in $(datadir) and putting result into
-+# the sed_command instead of hardcoding /usr/share
-+datadir_escaped=\/usr\/share
-+sed_command='s/user-guide.xml/$(datadir_escaped)\/gnome\/help\/user-guide\/$(lang)\/user-guide.xml/'
-+
- omf: omf_timestamp
- 
--omf_timestamp: $(omffile)
-+omf_timestamp: $(omffile) $(other_omffile)
- 	-for file in $(omffile); do \
- 	  scrollkeeper-preinstall $(docdir)/$(docname).xml $(srcdir)/$$file $$file.out; \
- 	done
-+	-for file in $(other_omffile); do \
-+	  sed -e $(sed_command) $$file > $$file.out; \
-+	done
- 	touch omf_timestamp
- 
- install-data-hook-omf:
- 	$(mkinstalldirs) $(DESTDIR)$(omf_dest_dir)
--	for file in $(omffile); do \
-+	for file in $(omffile) $(other_omffile); do \
- 		$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
- 	done
- 	-scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
--- a/patches/gnome-user-docs-10-sag_linux.diff	Thu Dec 08 17:09:49 2005 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
---- gnome2-user-docs-2.5.0/gnome2-system-admin-guide/C/Makefile.am.orig	Wed Jun 23 21:12:56 2004
-+++ gnome2-user-docs-2.5.0/gnome2-system-admin-guide/C/Makefile.am	Wed Jun 23 21:16:56 2004
-@@ -3,15 +3,23 @@
- lang = C
- omffile = system-admin-guide-C.omf
- entities = appendixa.xml \
-+	   appendixb.xml \
-+	   fontconfig.xml \
-+	   typeconv.xml \
-+	   lockdown.xml \
-+	   sundocs.xml \
-+	   preface.xml \
-+	   remotedesktop.xml \
-+	   localization.xml \
-+	   platformnote.xml \
-+	   mouseconv.xml \
- 	   gconf.xml \
- 	   glossary.xml \
- 	   legal.xml \
- 	   menustructure.xml \
- 	   mimetypes.xml \
--	   gdm.xml \
- 	   performance.xml \
- 	   screensavers.xml \
--	   gdm.xml \
- 	   sessions.xml \
- 	   help.xml \
- 	   themes.xml
---- gnome2-user-docs-2.5.0/gnome2-system-admin-guide/C/Makefile.in.orig	Wed Jun 23 21:13:06 2004
-+++ gnome2-user-docs-2.5.0/gnome2-system-admin-guide/C/Makefile.in	Wed Jun 23 21:16:46 2004
-@@ -145,15 +145,23 @@
- lang = C
- omffile = system-admin-guide-C.omf
- entities = appendixa.xml \
-+	   appendixb.xml \
-+	   lockdown.xml \
-+	   fontconfig.xml \
-+	   typeconv.xml \
-+	   sundocs.xml \
-+	   preface.xml \
-+	   remotedesktop.xml \
-+	   localization.xml \
-+	   platformnote.xml \
-+	   mouseconv.xml \
- 	   gconf.xml \
- 	   glossary.xml \
- 	   legal.xml \
- 	   menustructure.xml \
- 	   mimetypes.xml \
--	   gdm.xml \
- 	   performance.xml \
- 	   screensavers.xml \
--	   gdm.xml \
- 	   sessions.xml \
- 	   help.xml \
- 	   themes.xml