From 4647e0c39c4c131a9e4fa04e2ebb2fe7383366fb Mon Sep 17 00:00:00 2001
From: Ettore Perazzoli <ettore@src.gnome.org>
Date: Wed, 14 Nov 2001 19:52:27 +0000
Subject: Point to index.html instead of `evolution.sgml'.

* C/evolution-C.omf: Point to index.html instead of
`evolution.sgml'.

* sgmldocs.make: Install the SGML files in evolution/sgml, and the
HTML files in evolution.

svn path=/trunk/; revision=14698
---
 help/C/evolution-C.omf |  4 ++--
 help/ChangeLog         | 11 +++++++++++
 help/sgmldocs.make     |  9 +++++++--
 3 files changed, 20 insertions(+), 4 deletions(-)

(limited to 'help')

diff --git a/help/C/evolution-C.omf b/help/C/evolution-C.omf
index 004068a52e..c72105f179 100644
--- a/help/C/evolution-C.omf
+++ b/help/C/evolution-C.omf
@@ -7,8 +7,8 @@
     <subject>
       <category>GNOME|Applications</category>
     </subject>
-    <format mime="text/sgml"/>
-    <identifier url="evolution.sgml"/>
+    <format mime="text/html"/>
+    <identifier url="index.html"/>
     <language code="C"/>
   </resource>
 </omf>
diff --git a/help/ChangeLog b/help/ChangeLog
index 870d6698e9..ce988dce00 100644
--- a/help/ChangeLog
+++ b/help/ChangeLog
@@ -1,3 +1,14 @@
+2001-11-14  Ettore Perazzoli  <ettore@ximian.com>
+
+	[Workaround for Nautilus/Scrollkeeper bug that prevents our SGML
+	files to generate the docs properly; pointed out by Greg Leblanc.]
+
+	* C/evolution-C.omf: Point to index.html instead of
+	`evolution.sgml'.
+
+	* sgmldocs.make: Install the SGML files in evolution/sgml, and the
+	HTML files in evolution.
+
 2001-10-29  Aaron Weber  <aaron@ximian.com>
 
 	* C/apx-bugs.sgml: typos, redescribe 1.1 bugs. Re-validated.
diff --git a/help/sgmldocs.make b/help/sgmldocs.make
index 1dca7e7fc5..1cd9eb3af4 100644
--- a/help/sgmldocs.make
+++ b/help/sgmldocs.make
@@ -51,7 +51,7 @@ omf: omf_timestamp
 omf_timestamp: $(omffile)
 	-for file in $(srcdir)/$(omffile); do \
 	  basefile=`echo $$file | sed -e 's,^.*/,,'`; \
-	  scrollkeeper-preinstall $(docdir)/$(docname).sgml $$file $(omf_dir)/$$basefile; \
+	  scrollkeeper-preinstall $(docdir)/index.html $$file $(omf_dir)/$$basefile; \
 	done
 	touch omf_timestamp
 
@@ -93,7 +93,12 @@ app-dist-hook: index.html
 install-data-am: index.html omf
 	-$(mkinstalldirs) $(DESTDIR)$(docdir)/stylesheet-images
 	-$(mkinstalldirs) $(DESTDIR)$(docdir)/figures
-	-cp $(srcdir)/$(sgml_files) $(DESTDIR)$(docdir)
+	-$(mkinstalldirs) $(DESTDIR)$(docdir)/sgml
+
+	-for file in $(sgml_files); do \
+         $(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(docdir)/sgml ; \
+        done
+
 	-for file in $(srcdir)/$(docname)/*.html $(srcdir)/$(docname)/*.css; do \
 	  basefile=`echo $$file | sed -e 's,^.*/,,'`; \
 	  $(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/$$basefile; \
-- 
cgit