# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1259605502 18000
# Node ID 81c5ea6ddf811f0cfc95e092a7dc7f164977497b
# Parent  cee6c63cff329836f5799a94cdd23fbad0251b29
doc/interpreter build fixes

diff -r cee6c63cff32 -r 81c5ea6ddf81 doc/ChangeLog
--- a/doc/ChangeLog	Sun Nov 29 22:12:41 2009 +0100
+++ b/doc/ChangeLog	Mon Nov 30 13:25:02 2009 -0500
@@ -1,3 +1,14 @@
+2009-11-30  John W. Eaton  <jwe@octave.org>
+
+	* interpreter/Makefile.a (nodist_octave_TEXINFOS): Add
+	contributors.texi and $(MUNGED_TEXI_SRC) to the list.
+	(dist_octave_TEXINFOS): Delete.
+	(DISTCLEANFILES, all_octave_TEXINFOS): New variables.
+	($(srcdir)/octave.info, octave.dvi, octave.pdf,	octave.html):
+	Depend on $(all_octave_TEXINFOS), not $(octave_TEXINFOS).
+	(octave.ps): Depend on .dvi file and EPS files, but not .texi
+	source files.
+
 2009-11-27  David Bateman  <dbateman@free.fr>
 
 	* doc/interpreter/contributors.in: Add Kacper Kowalik.
diff -r cee6c63cff32 -r 81c5ea6ddf81 doc/interpreter/Makefile.am
--- a/doc/interpreter/Makefile.am	Sun Nov 29 22:12:41 2009 +0100
+++ b/doc/interpreter/Makefile.am	Mon Nov 30 13:25:02 2009 -0500
@@ -134,25 +134,28 @@
   var.texi
 
 info_TEXINFOS = octave.texi
-nodist_octave_TEXINFOS = \
-  ../conf.texi 
+nodist_octave_TEXINFOS = ../conf.texi contributors.texi $(MUNGED_TEXI_SRC)
 
-dist_octave_TEXINFOS = \
-  contributors.texi \
-  $(MUNGED_TEXI_SRC)
+all_octave_TEXINFOS = \
+  $(info_TEXINFOS) \
+  $(nodist_octave_TEXINFOS)
 
 TXI_SRC = $(MUNGED_TEXI_SRC:.texi=.txi)
 
+DISTCLEANFILES = $(MUNGED_TEXI_SRC)
+
 ../conf.texi:
 	$(MAKE) -C .. conf.texi
 
-$(srcdir)/octave.info: $(octave_TEXINFOS) $(IMAGES_TXT) $(EXAMPLE_FILES)
+$(srcdir)/octave.info: $(all_octave_TEXINFOS) $(IMAGES_TXT) $(EXAMPLE_FILES)
 
-octave.dvi octave.ps: $(octave_TEXINFOS) $(IMAGES_EPS) $(EXAMPLE_FILES)
+octave.dvi: $(all_octave_TEXINFOS) $(IMAGES_EPS) $(EXAMPLE_FILES)
 
-octave.pdf: $(octave_TEXINFOS) $(IMAGES_PDF) $(EXAMPLE_FILES)
+octave.ps: octave.dvi $(IMAGES_EPS)
 
-octave.html: $(octave_TEXINFOS) $(IMAGES_PNG) $(EXAMPLE_FILES)
+octave.pdf: $(all_octave_TEXINFOS) $(IMAGES_PDF) $(EXAMPLE_FILES)
+
+octave.html: $(all_octave_TEXINFOS) $(IMAGES_PNG) $(EXAMPLE_FILES)
 
 all-local: dvi html pdf ps doc-cache