# HG changeset patch
# User Rik <rdrider0-list@yahoo.com>
# Date 1259040460 28800
# Node ID 02d59b67632ff2718c666438979e1785bce5b3d0
# Parent  5d5dc23d6c56a95d6c555f8eb79d798a0240b6be
Stop distribution of conf.texi by autotools

conf.texi must not be distributed.  Instead it must be re-made from
conf.texi.in during the configure stage of compilation.

diff -r 5d5dc23d6c56 -r 02d59b67632f doc/ChangeLog
--- a/doc/ChangeLog	Mon Nov 23 16:56:35 2009 -0800
+++ b/doc/ChangeLog	Mon Nov 23 21:27:40 2009 -0800
@@ -1,3 +1,9 @@
+2009-11-23  Rik <octave@nomad.inbox5.com>
+
+	* faq/Makefile.am, interpreter/Makefile.am, liboctave/Makefile.am: 
+	Stop distribution of conf.texi by autotools.  conf.texi must be re-made
+	from conf.texi.in during configure step
+
 2009-11-23  Rik <octave@nomad.inbox5.com>
 
 	* Makefile.am: Add . to SUBDIRS to force automake to compile this
diff -r 5d5dc23d6c56 -r 02d59b67632f doc/faq/Makefile.am
--- a/doc/faq/Makefile.am	Mon Nov 23 16:56:35 2009 -0800
+++ b/doc/faq/Makefile.am	Mon Nov 23 21:27:40 2009 -0800
@@ -27,7 +27,7 @@
 
 info_TEXINFOS = OctaveFAQ.texi
 
-OctaveFAQ_TEXINFOS = ../conf.texi
+nodist_OctaveFAQ_TEXINFOS = ../conf.texi
 
 ../conf.texi:
 	$(MAKE) -C .. conf.texi
diff -r 5d5dc23d6c56 -r 02d59b67632f doc/interpreter/Makefile.am
--- a/doc/interpreter/Makefile.am	Mon Nov 23 16:56:35 2009 -0800
+++ b/doc/interpreter/Makefile.am	Mon Nov 23 21:27:40 2009 -0800
@@ -134,8 +134,10 @@
   var.texi
 
 info_TEXINFOS = octave.texi
-octave_TEXINFOS = \
-  ../conf.texi \
+nodist_octave_TEXINFOS = \
+  ../conf.texi 
+
+dist_octave_TEXINFOS = \
   contributors.texi \
   $(MUNGED_TEXI_SRC)
 
diff -r 5d5dc23d6c56 -r 02d59b67632f doc/liboctave/Makefile.am
--- a/doc/liboctave/Makefile.am	Mon Nov 23 16:56:35 2009 -0800
+++ b/doc/liboctave/Makefile.am	Mon Nov 23 21:27:40 2009 -0800
@@ -33,8 +33,10 @@
 
 info_TEXINFOS = liboctave.texi
 
-liboctave_TEXINFOS = \
-  ../conf.texi \
+nodist_liboctave_TEXINFOS = \
+  ../conf.texi
+
+dist_liboctave_TEXINFOS = \
   array.texi \
   bugs.texi \
   cp-idx.texi \