# HG changeset patch
# User Jaroslav Hajek <highegg@gmail.com>
# Date 1244029901 -7200
# Node ID 0dc1d0f1f79c1f7bce9f0e867a68071808ae25f9
# Parent  40ba43a4745f7fd4c22667efea97ce667ed2f17f
omit conf.texi from distribution

diff --git a/doc/ChangeLog b/doc/ChangeLog
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2009-06-03  Jaroslav Hajek  <highegg@gmail.com>
+
+	* Makefile.in: Omit conf.texi in DISTFILES.
+
 2009-06-02  Jaroslav Hajek  <highegg@gmail.com>
 
 	* interpreter/oop.txi: Update docs of polynomial class, mention
diff --git a/doc/Makefile.in b/doc/Makefile.in
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,22 +1,10 @@
+#
 # Makefile for octave's doc directory
 #
-# Copyright (C) 1996, 1997, 1999, 2000, 2005, 2006, 2007, 2009 John W. Eaton
-#
-# This file is part of Octave.
-# 
-# Octave is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; either version 3 of the License, or (at
-# your option) any later version.
-# 
-# Octave is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with Octave; see the file COPYING.  If not, see
-# <http://www.gnu.org/licenses/>.
+# John W. Eaton
+# jwe@bevo.che.wisc.edu
+# University of Wisconsin-Madison
+# Department of Chemical Engineering
 
 TOPDIR = ..
 
@@ -33,7 +21,7 @@
 
 SOURCES =
 
-DISTFILES = $(addprefix $(srcdir)/, Makefile.in ChangeLog conf.texi.in texinfo.tex texmf.cnf) conf.texi
+DISTFILES = $(addprefix $(srcdir)/, Makefile.in ChangeLog conf.texi.in texinfo.tex)
 
 SUBDIRS = faq interpreter liboctave refcard
 
@@ -42,7 +30,7 @@
 all: conf.texi $(SUBDIRS)
 .PHONY: all
 
-conf.texi: conf.texi.in $(TOPDIR)/Makeconf $(top_srcdir)/src/version.h
+conf.texi: conf.texi.in $(TOPDIR)/Makeconf
 	@$(do-subst-texinfo-vals)
 
 ../BUGS ../INSTALL.OCTAVE:
@@ -67,11 +55,11 @@
 TAGS:: $(SOURCES)
 	etags $(SOURCES)
 
-distclean maintainer-clean::
-	rm -f tags TAGS Makefile
+distclean::
+	rm -f Makefile
 
 maintainer-clean::
-	rm -f conf.texi
+	rm -f tags TAGS Makefile
 
 dist: conf.texi
 	ln $(DISTFILES) ../`cat ../.fname`/doc