aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2001-05-16 10:52:37 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2001-05-16 10:52:37 +0800
commitbc6aeab0b512f8753c75e9976ce205c48d4293f5 (patch)
tree594d283768d772ae4841bba92a678d4b2629b210
parentda08b32050f2ac15dcf0086b4f0b232e41afaab5 (diff)
downloadgsoc2013-evolution-bc6aeab0b512f8753c75e9976ce205c48d4293f5.tar
gsoc2013-evolution-bc6aeab0b512f8753c75e9976ce205c48d4293f5.tar.gz
gsoc2013-evolution-bc6aeab0b512f8753c75e9976ce205c48d4293f5.tar.bz2
gsoc2013-evolution-bc6aeab0b512f8753c75e9976ce205c48d4293f5.tar.lz
gsoc2013-evolution-bc6aeab0b512f8753c75e9976ce205c48d4293f5.tar.xz
gsoc2013-evolution-bc6aeab0b512f8753c75e9976ce205c48d4293f5.tar.zst
gsoc2013-evolution-bc6aeab0b512f8753c75e9976ce205c48d4293f5.zip
Get the User guide and the Evolution FAQ to be installed into separate
directories. svn path=/trunk/; revision=9834
-rw-r--r--doc/C/Makefile.am19
-rw-r--r--doc/ChangeLog12
-rw-r--r--help/C/Makefile.am19
-rw-r--r--help/ChangeLog12
4 files changed, 50 insertions, 12 deletions
diff --git a/doc/C/Makefile.am b/doc/C/Makefile.am
index cdf9d47dbe..67b44d27b3 100644
--- a/doc/C/Makefile.am
+++ b/doc/C/Makefile.am
@@ -38,23 +38,30 @@ dist-hook:
mkdir $(distdir)/evolution/stylesheet-images
-cp evolution/stylesheet-images/* $(distdir)/evolution/stylesheet-images
+# FIXME really messy here
install-data-local: evolution-guide evolution-faq
- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(evolution_helpdir)
+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(evolution_helpdir)/evolution-guide
-for file in $(srcdir)/evolution/*.html $(srcdir)/evolution/*.css; do \
basefile=`basename $$file`; \
- $(INSTALL_DATA) $$file $(DESTDIR)$(evolution_helpdir)/$$basefile; \
+ $(INSTALL_DATA) $$file $(DESTDIR)$(evolution_helpdir)/evolution-guide/$$basefile; \
done
- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(evolution_helpdir)/fig
+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(evolution_helpdir)/evolution-faq
+ -for file in $(srcdir)/evolution-faq/*.html $(srcdir)/evolution-faq/*.css; do \
+ basefile=`basename $$file`; \
+ $(INSTALL_DATA) $$file $(DESTDIR)$(evolution_helpdir)/evolution-faq/$$basefile; \
+ done
+
+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(evolution_helpdir)/evolution-guide/fig
-for file in $(srcdir)/fig/*.png; do \
basefile=`basename $$file`; \
- $(INSTALL_DATA) $$file $(DESTDIR)$(evolution_helpdir)/fig/$$basefile; \
+ $(INSTALL_DATA) $$file $(DESTDIR)$(evolution_helpdir)/evolution-guide/fig/$$basefile; \
done
- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(evolution_helpdir)/stylesheet-images
+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(evolution_helpdir)/evolution-guide/stylesheet-images
-for file in $(srcdir)/evolution/stylesheet-images/*; do \
basefile=`basename $$file`; \
- $(INSTALL_DATA) $$file $(DESTDIR)$(evolution_helpdir)/stylesheet-images/$$basefile; \
+ $(INSTALL_DATA) $$file $(DESTDIR)$(evolution_helpdir)/evolution-guide/stylesheet-images/$$basefile; \
done
evolution.ps: evolution.sgml
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 1b5327ee46..4e0f87ac70 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,15 @@
+2001-05-15 Ettore Perazzoli <ettore@ximian.com>
+
+ * C/Makefile.am (SGML_FILES): Renamed to `GUIDE_SGML_FILES'.
+ (EXTRA_DIST): Add `$(FAQ_SGML_FILES)'.
+ (all): Depend on `evolution-faq' too.
+ (evolution-faq): New.
+ (install-data-local): Depend on `evolution-faq' too. Install the
+ FAQ into `$(evolution_helpdir)/evolution-faq' and the guide into
+ `$(evolution_helpdir)/evolution-guide'.
+
+ * C/evolution-faq.sgml: New.
+
2001-04-23 Jon Trowbridge <trow@ximian.com>
* C/Makefile.am (install-data-local): Changed dependency for
diff --git a/help/C/Makefile.am b/help/C/Makefile.am
index cdf9d47dbe..67b44d27b3 100644
--- a/help/C/Makefile.am
+++ b/help/C/Makefile.am
@@ -38,23 +38,30 @@ dist-hook:
mkdir $(distdir)/evolution/stylesheet-images
-cp evolution/stylesheet-images/* $(distdir)/evolution/stylesheet-images
+# FIXME really messy here
install-data-local: evolution-guide evolution-faq
- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(evolution_helpdir)
+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(evolution_helpdir)/evolution-guide
-for file in $(srcdir)/evolution/*.html $(srcdir)/evolution/*.css; do \
basefile=`basename $$file`; \
- $(INSTALL_DATA) $$file $(DESTDIR)$(evolution_helpdir)/$$basefile; \
+ $(INSTALL_DATA) $$file $(DESTDIR)$(evolution_helpdir)/evolution-guide/$$basefile; \
done
- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(evolution_helpdir)/fig
+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(evolution_helpdir)/evolution-faq
+ -for file in $(srcdir)/evolution-faq/*.html $(srcdir)/evolution-faq/*.css; do \
+ basefile=`basename $$file`; \
+ $(INSTALL_DATA) $$file $(DESTDIR)$(evolution_helpdir)/evolution-faq/$$basefile; \
+ done
+
+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(evolution_helpdir)/evolution-guide/fig
-for file in $(srcdir)/fig/*.png; do \
basefile=`basename $$file`; \
- $(INSTALL_DATA) $$file $(DESTDIR)$(evolution_helpdir)/fig/$$basefile; \
+ $(INSTALL_DATA) $$file $(DESTDIR)$(evolution_helpdir)/evolution-guide/fig/$$basefile; \
done
- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(evolution_helpdir)/stylesheet-images
+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(evolution_helpdir)/evolution-guide/stylesheet-images
-for file in $(srcdir)/evolution/stylesheet-images/*; do \
basefile=`basename $$file`; \
- $(INSTALL_DATA) $$file $(DESTDIR)$(evolution_helpdir)/stylesheet-images/$$basefile; \
+ $(INSTALL_DATA) $$file $(DESTDIR)$(evolution_helpdir)/evolution-guide/stylesheet-images/$$basefile; \
done
evolution.ps: evolution.sgml
diff --git a/help/ChangeLog b/help/ChangeLog
index 1b5327ee46..4e0f87ac70 100644
--- a/help/ChangeLog
+++ b/help/ChangeLog
@@ -1,3 +1,15 @@
+2001-05-15 Ettore Perazzoli <ettore@ximian.com>
+
+ * C/Makefile.am (SGML_FILES): Renamed to `GUIDE_SGML_FILES'.
+ (EXTRA_DIST): Add `$(FAQ_SGML_FILES)'.
+ (all): Depend on `evolution-faq' too.
+ (evolution-faq): New.
+ (install-data-local): Depend on `evolution-faq' too. Install the
+ FAQ into `$(evolution_helpdir)/evolution-faq' and the guide into
+ `$(evolution_helpdir)/evolution-guide'.
+
+ * C/evolution-faq.sgml: New.
+
2001-04-23 Jon Trowbridge <trow@ximian.com>
* C/Makefile.am (install-data-local): Changed dependency for