# HG changeset patch
# User Rik <rdrider0-list@yahoo.com>
# Date 1260314705 28800
# Node ID 4c681ff57bc379da6776b264cd4d2fdcad7002e7
# Parent  314d2234b6603a2774bb156ef7da716c4a638338
Modifications to makefiles to pass distcheck test

All generated documentation, as well as sources for it, are now distributed.
This eliminates the need for a user to have Texinfo merely to compile Octave.

diff -r 314d2234b660 -r 4c681ff57bc3 ChangeLog
--- a/ChangeLog	Tue Dec 08 12:57:01 2009 +0100
+++ b/ChangeLog	Tue Dec 08 15:25:05 2009 -0800
@@ -1,3 +1,7 @@
+2009-12-08  Rik <octave@nomad.inbox5.com>
+
+	* Makefile.am: add BUGS and OCTAVE.INSTALL to DISTCLEANFILES
+
 2009-12-08  John W. Eaton  <jwe@octave.org>
 
 	* configure.ac: Update gnuplot status message.
diff -r 314d2234b660 -r 4c681ff57bc3 Makefile.am
--- a/Makefile.am	Tue Dec 08 12:57:01 2009 +0100
+++ b/Makefile.am	Tue Dec 08 15:25:05 2009 -0800
@@ -80,12 +80,14 @@
   octave-config$(SCRIPTS_EXE_SUFFIX) \
   octave-bug$(SCRIPTS_EXE_SUFFIX)
 
-CLEANFILES = $(BUILT_SHELL_FILES)
-
 INFO_FILES = \
   INSTALL.OCTAVE \
   BUGS
 
+CLEANFILES = $(BUILT_SHELL_FILES)
+
+DISTCLEANFILES = $(INFO_FILES) 
+
 CONFIG_FILES = @ac_config_headers@ @ac_config_files@
 
 BUILT_SOURCES = run-octave
diff -r 314d2234b660 -r 4c681ff57bc3 doc/ChangeLog
--- a/doc/ChangeLog	Tue Dec 08 12:57:01 2009 +0100
+++ b/doc/ChangeLog	Tue Dec 08 15:25:05 2009 -0800
@@ -1,3 +1,8 @@
+2009-12-08  Rik <octave@nomad.inbox5.com>
+
+	* interpreter/Makefile.am: Distribute all generated documentation (.pdf,
+	.ps, .html, .dvi) to remove build requirement for TexInfo
+
 2009-12-07  Rik <octave@nomad.inbox5.com>
 
 	* interpreter/Makefile.am, faq/Makefile.am, liboctave/Makefile.am: Document
diff -r 314d2234b660 -r 4c681ff57bc3 doc/interpreter/Makefile.am
--- a/doc/interpreter/Makefile.am	Tue Dec 08 12:57:01 2009 +0100
+++ b/doc/interpreter/Makefile.am	Tue Dec 08 15:25:05 2009 -0800
@@ -204,6 +204,10 @@
   mk_doc_cache.m \
   mkcontrib.awk \
   munge-texi.cc \
+  octave.dvi \
+  octave.html \
+  octave.pdf \
+  octave.ps \
   $(IMAGES) \
   $(IMAGES_SRC) \
   $(TXI_SRC)
diff -r 314d2234b660 -r 4c681ff57bc3 scripts/ChangeLog
--- a/scripts/ChangeLog	Tue Dec 08 12:57:01 2009 +0100
+++ b/scripts/ChangeLog	Tue Dec 08 15:25:05 2009 -0800
@@ -1,3 +1,8 @@
+2009-12-09  Rik <octave@nomad.inbox5.com>
+
+	* Makefile.am: Distribute DOCSTRINGS in tar.gz file
+	* mkdoc: pass current directory, "./", when running mkdoc on local files
+
 2009-12-07  Jaroslav Hajek  <highegg@gmail.com>
 
 	* general/interp1q.m: Use more optimal code.
diff -r 314d2234b660 -r 4c681ff57bc3 scripts/Makefile.am
--- a/scripts/Makefile.am	Tue Dec 08 12:57:01 2009 +0100
+++ b/scripts/Makefile.am	Tue Dec 08 15:25:05 2009 -0800
@@ -74,6 +74,7 @@
 include time/module.mk
 
 DISTCLEANFILES = \
+  DOCSTRINGS \
   gethelp$(BUILD_EXEEXT) \
   $(PKG_ADD_FILES) \
   $(DIRSTAMP_FILES) \
@@ -329,7 +330,7 @@
 
 DOCSTRINGS: mkdoc $(FCN_FILES) $(GEN_FCN_FILES) gethelp$(BUILD_EXEEXT) 
 	$(srcdir)/mkdoc "$(srcdir)" $(FCN_FILES) -- $(GEN_FCN_FILES) > $@-t
-	mv $@-t $@
+	$(simple_move_if_change_rule)
 
 gethelp$(BUILD_EXEEXT): gethelp.cc
 	$(BUILD_CXX) $(BUILD_CXXFLAGS) -o $@ $^ $(BUILD_LDFLAGS)
diff -r 314d2234b660 -r 4c681ff57bc3 scripts/mkdoc
--- a/scripts/mkdoc	Tue Dec 08 12:57:01 2009 +0100
+++ b/scripts/mkdoc	Tue Dec 08 15:25:05 2009 -0800
@@ -40,7 +40,7 @@
   for arg
   do
     if [ "$arg" = "--" ]; then
-      prefix=""
+      prefix="./"
     else
       $PERL -w -e '
 	unless (@ARGV == 2) { die "Usage: $0 srcdir m_filename" ; }
diff -r 314d2234b660 -r 4c681ff57bc3 src/ChangeLog
--- a/src/ChangeLog	Tue Dec 08 12:57:01 2009 +0100
+++ b/src/ChangeLog	Tue Dec 08 15:25:05 2009 -0800
@@ -1,3 +1,7 @@
+2009-12-09  Rik <octave@nomad.inbox5.com>
+
+	* Makefile.am: Distribute DOCSTRINGS in tar.gz file
+
 2009-12-07  Jaroslav Hajek  <highegg@gmail.com>
 
 	* dirfns.cc (Ffnmatch): Simplify.
diff -r 314d2234b660 -r 4c681ff57bc3 src/Makefile.am
--- a/src/Makefile.am	Tue Dec 08 12:57:01 2009 +0100
+++ b/src/Makefile.am	Tue Dec 08 15:25:05 2009 -0800
@@ -575,6 +575,9 @@
   oct-parse.output \
   $(BUILT_NODISTFILES)
 
+DISTCLEANFILES = \
+  DOCSTRINGS
+
 MAINTAINERCLEANFILES = \
   $(BUILT_DISTFILES)