aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2001-11-15 03:52:27 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2001-11-15 03:52:27 +0800
commit4647e0c39c4c131a9e4fa04e2ebb2fe7383366fb (patch)
tree1548cf70bb48c7f7861b74d5489ab80c5e789f8f
parent6838fe8bf735c9b1b5f5c22a5e41e3330c323648 (diff)
downloadgsoc2013-evolution-4647e0c39c4c131a9e4fa04e2ebb2fe7383366fb.tar
gsoc2013-evolution-4647e0c39c4c131a9e4fa04e2ebb2fe7383366fb.tar.gz
gsoc2013-evolution-4647e0c39c4c131a9e4fa04e2ebb2fe7383366fb.tar.bz2
gsoc2013-evolution-4647e0c39c4c131a9e4fa04e2ebb2fe7383366fb.tar.lz
gsoc2013-evolution-4647e0c39c4c131a9e4fa04e2ebb2fe7383366fb.tar.xz
gsoc2013-evolution-4647e0c39c4c131a9e4fa04e2ebb2fe7383366fb.tar.zst
gsoc2013-evolution-4647e0c39c4c131a9e4fa04e2ebb2fe7383366fb.zip
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
-rw-r--r--help/C/evolution-C.omf4
-rw-r--r--help/ChangeLog11
-rw-r--r--help/sgmldocs.make9
3 files changed, 20 insertions, 4 deletions
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; \