Enhancements are:
* laying some foundations for using the automated build process, paving the way for eliminating make_manuals.sh
* builds an info file, and incorporates a mechanism for installing it

This means that, when you do a top-level
   make install
it will install an (English) Cinelerra info file to the standard place, and create a dir entry for info. By applying these patches, you will be able to type
   info cinelerra
to bring up the Cinelerra manual. Alternatively, you could just type
   info
and access the cinelerra manual from the Applications section.

If this patch makes it into the subversion repository, I might be emboldened to improve the doc build process, and add in a simple man page (it is Debian policy that each program should have a man page:
http://www.debian.org/doc/debian-policy/ch-docs.html )


diff --git a/Makefile.am b/Makefile.am
index 63a389b..0e29d5d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS=libmpeg3 quicktime mpeg2enc toolame-02l \
-	guicast cinelerra mplexlo plugins po image m4
-EXTRA_DIST = admin debian doc depcomp README.BUILD LICENSE \
+	guicast cinelerra mplexlo plugins po image m4 doc
+EXTRA_DIST = admin debian depcomp README.BUILD LICENSE \
 	cinelerra-cvs-current.spec
 AUTOMAKE_OPTIONS=foreign
 ACLOCAL_AMFLAGS = -I m4
diff --git a/configure.in b/configure.in
index ed80056..52dc29f 100644
--- a/configure.in
+++ b/configure.in
@@ -459,6 +459,7 @@ AC_SUBST(OBJCOPYARCH, $ocarch)
 
 
 AC_OUTPUT(Makefile cinelerra-cvs-current.spec po/Makefile.in \
+	doc/Makefile \
 	m4/Makefile \
 					libmpeg3/Makefile libmpeg3/video/Makefile libmpeg3/audio/Makefile \
 					quicktime/Makefile \
diff --git a/doc/Makefile.am b/doc/Makefile.am
new file mode 100644
index 0000000..8f86c9c
--- /dev/null
+++ b/doc/Makefile.am
@@ -0,0 +1,21 @@
+# A good source for reference on how I (mark carter) cobbled this
+# file together is to look at
+# http://sources.redhat.com/automake/automake.html#Texinfo
+
+# On Gutsy, I would expect info files to be installed in
+# /usr/share/info
+
+
+
+info_TEXINFOS = cinelerra_cv_manual_en.texi
+
+
+
+all : ${info_TEXINFOS}
+	makeinfo cinelerra_cv_manual_en.texi
+
+
+install : ${info_TEXINFOS}
+	install-info cinelerra.info
+	cp cinelerra.info* /usr/share/info
+
diff --git a/doc/cinelerra_cv_manual_en.texi b/doc/cinelerra_cv_manual_en.texi
index 1626318..62017b1 100644
--- a/doc/cinelerra_cv_manual_en.texi
+++ b/doc/cinelerra_cv_manual_en.texi
@@ -10,7 +10,7 @@
 @c Foundation; either version 2 of the License, or (at your option) any later
 @c version.
 
[EMAIL PROTECTED] cinelerra_cv_manual_en.info
[EMAIL PROTECTED] cinelerra.info
 @documentlanguage en
 @documentencoding ISO-8859-1
 @settitle Cinelerra CV Manual
@@ -18,6 +18,11 @@
 @set EDITION 1.49.EN
 @set VERSION 2.1
 
[EMAIL PROTECTED] Applications
[EMAIL PROTECTED]
+* Cinelerra: (cinelerra).           Non-Linear Video Editor
[EMAIL PROTECTED] direntry
+
 @finalout
 @titlepage
 @title Cinelerra CV Manual

Reply via email to