Documentation building fixes merged from the evolution-0-10-branch:

  Get the docs to build and install properly.  Temporarily disable the
  importer devel docs as they seem to be pretty broken.

svn path=/trunk/; revision=9507

5 files changed, 34 insertions, 18 deletions

diff --git a/doc/C/Makefile.am b/doc/C/Makefile.am
index 88b71fcb0b..486a10ca58 100644
--- a/doc/C/Makefile.am
+++ b/doc/C/Makefile.am
@@ -1,6 +1,7 @@
 evolution_helpdir = $(datadir)/gnome/help/evolution/C
 
 SGML_FILES =			\
+	evolution.sgml		\
 	apx-authors.sgml	\
 	apx-bugs.sgml		\
 	apx-gloss.sgml		\
@@ -15,25 +16,25 @@ SGML_FILES =			\
 	usage-sync.sgml
 
 
-EXTRA_DIST = \
+EXTRA_DIST = 		\
 	$(SGML_FILES)
 
 all: evolution-guide
 
 evolution-guide: $(SGML_FILES)
-	-db2html evolution-guide.sgml
+	-db2html evolution.sgml
 
 dist-hook:
-	mkdir $(distdir)/evolution-guide
-	-cp evolution-guide/*.html evolution-guide/*.css $(distdir)/evolution-guide
+	mkdir $(distdir)/evolution
+	-cp evolution/*.html evolution/*.css $(distdir)/evolution
 	mkdir $(distdir)/fig
 	-cp fig/*.png $(distdir)/fig
-	mkdir $(distdir)/evolution-guide/stylesheet-images
-	-cp evolution-guide/stylesheet-images/* $(distdir)/evolution-guide/stylesheet-images
+	mkdir $(distdir)/evolution/stylesheet-images
+	-cp evolution/stylesheet-images/* $(distdir)/evolution/stylesheet-images
 
-install-data-local: evolution-guide
+install-data-local: evolution
 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(evolution_helpdir)
-	-for file in $(srcdir)/evolution-guide/*.html $(srcdir)/evolution-guide/*.css; do \
+	-for file in $(srcdir)/evolution/*.html $(srcdir)/evolution/*.css; do \
 		basefile=`basename $$file`; \
 		$(INSTALL_DATA) $$file $(DESTDIR)$(evolution_helpdir)/$$basefile; \
 	done
@@ -45,7 +46,7 @@ install-data-local: evolution-guide
 	done
 
 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(evolution_helpdir)/stylesheet-images
-	-for file in $(srcdir)/evolution-guide/stylesheet-images/*; do \
+	-for file in $(srcdir)/evolution/stylesheet-images/*; do \
 		basefile=`basename $$file`; \
 		$(INSTALL_DATA) $$file $(DESTDIR)$(evolution_helpdir)/stylesheet-images/$$basefile; \
 	done
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 04f9f31800..dc34126b4c 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,11 @@
+2001-04-23  Ettore Perazzoli  <ettore@ximian.com>
+
+	* C/Makefile.am (SGML_FILES): Add `evolution.sgml'.
+	(evolution-guide): Process `evolution.sgml', not
+	`evolution-guide.sgml'.
+	(dist-hook): s/evolution-guide/evolution/
+	(install-data-local): Likewise.
+
 2001-02-23  Aaron Weber  <aaron@helixcode.com>
 
 	* C/apx-authors.sgml: s/helixcode/ximian (How I missed this page
diff --git a/doc/devel/ChangeLog b/doc/devel/ChangeLog
index 134159b2d2..0237e82112 100644
--- a/doc/devel/ChangeLog
+++ b/doc/devel/ChangeLog
@@ -1,3 +1,10 @@
+2001-04-23  Ettore Perazzoli  <ettore@ximian.com>
+
+	* evolution-devel-guide.sgml: Disable the importer references here
+	too.
+
+	* Makefile.am: Remove the importer stuff for now.
+
 2001-04-20  Damon Chaplin  <damon@ximian.com>
 
 	* importer/evolution-shell-importer.types: changed path to the
diff --git a/doc/devel/Makefile.am b/doc/devel/Makefile.am
index c5ee7a8e50..200905cffe 100644
--- a/doc/devel/Makefile.am
+++ b/doc/devel/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = calendar importer executive-summary
+SUBDIRS = calendar executive-summary
 
 # The name of the module.
 DOC_MODULE=evolution-devel-guide
@@ -34,14 +34,14 @@ local_entities =					\
 	calendar/cal-util/sgml/cal-util.sgml		\
 	calendar/cal-util/sgml/timeutil.sgml		\
 							\
-	importer/sgml/evolution-importer.sgml		\
-	importer/sgml/evolution-importer-client.sgml	\
-							\
 	executive-summary/sgml/executive-summary-component.sgml	\
 	executive-summary/sgml/executive-summary-component-factory.sgml	\
 	executive-summary/sgml/executive-summary-component-factory-client.sgml	\
 	executive-summary/sgml/executive-summary-html-view.sgml
 
+#	importer/sgml/evolution-importer.sgml		\
+#	importer/sgml/evolution-importer-client.sgml
+
 EXTRA_DIST =			\
 	$(content_files)
 
diff --git a/doc/devel/evolution-devel-guide.sgml b/doc/devel/evolution-devel-guide.sgml
index 4a88261da4..f410c01981 100644
--- a/doc/devel/evolution-devel-guide.sgml
+++ b/doc/devel/evolution-devel-guide.sgml
@@ -13,11 +13,11 @@
 <!ENTITY cal-util SYSTEM "calendar/cal-util/sgml/cal-util.sgml">
 <!ENTITY timeutil SYSTEM "calendar/cal-util/sgml/timeutil.sgml">
 
-<!ENTITY importer-public-reference SYSTEM "importer/public-reference.sgml">
-<!ENTITY importer-private-reference SYSTEM "importer/private-reference.sgml">
-<!ENTITY EvolutionImporter SYSTEM "importer/sgml/evolution-importer.sgml">
-<!ENTITY EvolutionImporterClient SYSTEM "importer/sgml/evolution-importer-client.sgml">
-<!ENTITY EvolutionImporterListener SYSTEM "importer/sgml/evolution-importer-listener.sgml">
+<!-- ENTITY importer-public-reference SYSTEM "importer/public-reference.sgml">
+<!-- ENTITY importer-private-reference SYSTEM "importer/private-reference.sgml">
+<!-- ENTITY EvolutionImporter SYSTEM "importer/sgml/evolution-importer.sgml">
+<!-- ENTITY EvolutionImporterClient SYSTEM "importer/sgml/evolution-importer-client.sgml">
+<!-- ENTITY EvolutionImporterListener SYSTEM "importer/sgml/evolution-importer-listener.sgml">
 
 <!ENTITY evolution-services-public-reference SYSTEM "executive-summary/public-reference.sgml">
 <!ENTITY evolution-services-private-reference SYSTEM "executive-summary/private-reference.sgml">