diff --git a/help/C/Makefile.am b/help/C/Makefile.am
index c8d1c15c81..d5713d895c 100644
--- a/help/C/Makefile.am
+++ b/help/C/Makefile.am
@@ -30,9 +30,9 @@ figs = \
figures/summary.png \
figures/vfolder-createrule-fig.png
figdir = figures
-docname = evolution
+docname = evolution-1.4
lang = C
-omffile = evolution-C.omf
+omffile = evolution-1.4-C.omf
entities = \
apx-authors.xml \
apx-bugs.xml \
@@ -52,6 +52,7 @@ entities = \
usage-mail.xml \
usage-mainwindow.xml \
usage-print.xml \
- usage-sync.xml \
+ usage-sync.xml
+
include $(top_srcdir)/help/xmldocs.make
dist-hook: app-dist-hook
diff --git a/help/C/evolution-C.omf b/help/C/evolution-C.omf
deleted file mode 100644
index 23dc3fdb86..0000000000
--- a/help/C/evolution-C.omf
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
- Ximian, Inc.
-
-
- Evolution Manual
-
- 2002
-
-
- A user's guide to Ximian Evolution which explains how to use
- its mail, calendar, addressbook, and task list features.
-
-
- manual
-
-
-
-
-
-
-
diff --git a/help/C/evolution.xml b/help/C/evolution.xml
deleted file mode 100644
index 56e5c3bc0f..0000000000
--- a/help/C/evolution.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-]>
-
-
-
-
-
-
- A User's Guide to Ximian Evolution
-
- AaronWeber
- KevinBreit
- EttorePerazzoli
- DuncanMak
-
-
- 2000-2002
- Ximian, Inc.
-
-
-
- This is version 1.2.1 of the Ximian Evolution manual. It describes
- version 1.2 of the Ximian Evolution groupware suite.
-
-
-
- Please note that legal and licensing information is in due to formatting issues with its
- previous location.
-
-
-
-
-
-
- Preface
- &LEGAL;
- &PREFACE;
-
-
-
- Getting Started with Ximian Evolution
-
-
- Part one of the Ximian Evolution manual
- describes how to use Ximian Evolution for
- email, contact management, and appointment and task
- scheduling. You'll find as you go along that there's more
- than one way to do things, and you can pick whichever method
- you like best.
-
-
-
- &USAGE-MAINWINDOW;
- &USAGE-EXEC-SUMMARY;
- &USAGE-MAIL;
- &USAGE-MAIL-ORG;
- &USAGE-CONTACT;
- &USAGE-CALENDAR;
- &USAGE-EXCHANGE;
- &USAGE-SYNC;
- &USAGE-PRINT;
-
-
- Configuring and Managing Ximian Evolution
-
-
- Ximian Evolution is highly
- configurable. Usually, when developers say that, they mean
- that they didn't test it out thoroughly and have left it to
- other programmers to "configure" themselves a working
- system. In the case of Ximian
- Evolution, "configurable" means that, while you
- can expect the program to work perfectly well with the default
- settings, it's also easy to alter its behavior in a wide
- variety of ways, so that it fits your needs exactly. This
- part of the book will describe that process, from the quickest
- glimpse of the Setup Assistant to an in-depth guide to obscure
- preferences settings.
-
-
-
- &CONFIG-PREFS;
- &CONFIG-SYNC;
-
-
- &MENUREF;
- &APX-GLOSS;
- &APX-BUGS;
- &APX-AUTHORS;
- &GPL;
- &GFDL;
-
-
\ No newline at end of file
diff --git a/help/ChangeLog b/help/ChangeLog
index 856b530f62..2a4307afb2 100644
--- a/help/ChangeLog
+++ b/help/ChangeLog
@@ -1,3 +1,15 @@
+2003-03-26 Ettore Perazzoli
+
+ * C/evolution-1.4-C.omf: Renamed from evolution-C.omf.
+ * C/evolution-1.4.xml: Renamed from evolution.xml.
+
+ * Makefile.am (SUBDIRS): Remove "no" for now.
+
+ * xmldocs.make: Updated to most recent version on GNOME CVS.
+
+ * C/Makefile.am (docname): Add version.
+ (omffile): Likewise.
+
2003-03-19 Aaron Weber
* Makefile.am: s/sgml/xml/ (DOH)
diff --git a/help/Makefile.am b/help/Makefile.am
index 77733ca6c3..29d835dd22 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS = C no
+SUBDIRS = C
EXTRA_DIST = xmldocs.make
diff --git a/help/omf.make b/help/omf.make
new file mode 100644
index 0000000000..3261e00158
--- /dev/null
+++ b/help/omf.make
@@ -0,0 +1,53 @@
+#
+# 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)
+#
+
+omf_dest_dir=$(datadir)/omf/@PACKAGE@
+scrollkeeper_localstate_dir = $(localstatedir)/scrollkeeper
+
+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)
diff --git a/help/xmldocs.make b/help/xmldocs.make
index 5d58b28b78..ad65ccf9f4 100644
--- a/help/xmldocs.make
+++ b/help/xmldocs.make
@@ -46,7 +46,7 @@ EXTRA_DIST = $(xml_files) $(omffile)
CLEANFILES = omf_timestamp
# If the following file is in a subdir (like help/) you need to add that to the path
-include $(top_srcdir)/omf.make
+include $(top_srcdir)/help/omf.make
all: omf