[Maxima-commits] CVS: maxima/doc/info include-maxima.texi.in, 1.1, 1.2 maxima.texi, 1.61, 1.62 Makefile.am, 1.67, 1.68 maxima.texi.in, 1.3, NONE

[Robert D. <rob...@us...>]

Update of /cvsroot/maxima/maxima/doc/info
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv13338/doc/info

Modified Files:
	Makefile.am 
Added Files:
	include-maxima.texi.in maxima.texi 
Removed Files:
	maxima.texi.in 
Log Message:
Merge in changes from 5.17 release branch.



Index: Makefile.am
===================================================================
RCS file: /cvsroot/maxima/maxima/doc/info/Makefile.am,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- Makefile.am	25 Dec 2008 16:08:45 -0000	1.67
+++ Makefile.am	25 Dec 2008 17:24:13 -0000	1.68
@@ -24,6 +24,7 @@
 
 SUBDIRS = $(ES_DIR) $(ES_DIR_UTF8) $(PT_DIR) $(PT_DIR_UTF8) $(PT_BR_DIR) $(PT_BR_DIR_UTF8)
 
+info_TEXINFOS = maxima.texi
 maxima_TEXINFOS = Introduction.texi Help.texi Command.texi Operators.texi \
   Expressions.texi Simplification.texi Plotting.texi Input.texi \
   Floating.texi Contexts.texi Polynomials.texi Constants.texi \
@@ -159,7 +160,7 @@
 maxima-index.lisp: maxima.info build_index.pl
 	perl ./build_index.pl maxima.info ':crlf' > maxima-index.lisp
 
-maxima.html: maxima.texi.in $(maxima_TEXINFOS)
+maxima.html: maxima.texi $(maxima_TEXINFOS)
 	sh extract_categories.sh maxima
 
 contents.hhc: maxima.html

--- maxima.texi.in DELETED ---