# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1260259078 18000
# Node ID f0f7c2477cdb295b15b4595abb281dd6db29ceac
# Parent  997cbe63fc604cb841885ddb4b868f1c8c0610a8
more makefile tweaks

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-08  John W. Eaton  <jwe@octave.org>
+
+	* configure.ac: Update gnuplot status message.
+	* acinclude.m4 (OCTAVE_PROG_GNUPLOT): Likewise.
+
 2009-12-07  John W. Eaton  <jwe@octave.org>
 
 	* examples/make_int.cc: Delete Emacs local variables.
diff --git a/acinclude.m4 b/acinclude.m4
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -643,9 +643,10 @@
     AC_MSG_WARN([plotting commands without it.])
     AC_MSG_WARN([])
     AC_MSG_WARN([If gnuplot is installed but it isn't in your path, you can])
-    AC_MSG_WARN([tell Octave where to find it by typing the command])
+    AC_MSG_WARN([tell Octave where to find it using the gnuplot_binary])
+    AC_MSG_WARN([function.  For example,])
     AC_MSG_WARN([])
-    AC_MSG_WARN([gnuplot_binary = "/full/path/to/gnuplot/binary"])
+    AC_MSG_WARN([gnuplot_binary ("/full/name/of/gnuplot/binary")])
     AC_MSG_WARN([])
     AC_MSG_WARN([at the Octave prompt.])
     AC_MSG_WARN([])
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -2419,12 +2419,15 @@
   AC_MSG_WARN([plotting commands without it.])
   AC_MSG_WARN([])
   AC_MSG_WARN([If gnuplot is installed but it isn't in your path, you can])
-  AC_MSG_WARN([tell Octave where to find it by typing the command])
+  AC_MSG_WARN([tell Octave where to find it using the gnuplot_binary])
+  AC_MSG_WARN([function.  For example,])
   AC_MSG_WARN([])
-  AC_MSG_WARN([gnuplot_binary = "/full/path/to/gnuplot/binary"])
+  AC_MSG_WARN([gnuplot_binary ("/full/name/of/gnuplot/binary")])
   AC_MSG_WARN([])
   AC_MSG_WARN([at the Octave prompt.])
   AC_MSG_WARN([])
+  AC_MSG_WARN([Setting default value to $GNUPLOT])
+  AC_MSG_WARN([])
   warn_msg_printed=true
 fi
 
diff --git a/scripts/ChangeLog b/scripts/ChangeLog
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,10 @@
+2009-12-08  John W. Eaton  <jwe@octave.org>
+
+	* Makefile.am (DOCSTRINGS): Depend on $(GEN_FCN_FILES) instead
+	of $(FCN_FILES_IN).  Pass $(GEN_FCN_FILES) to mkdoc instead of
+	$(FCN_FILES_IN).  Use mv instead of $(simple_move_if_change_rule).
+	(EXTRA_DIST): Include  $(GEN_FCN_FILES) in the list.
+
 2009-12-07  Jaroslav Hajek  <highegg@gmail.com>
 
 	* general/interp1.m: Allow discontinuities (jumps) for the "nearest" and
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -322,13 +322,14 @@
 EXTRA_DIST += \
   $(IMAGES) \
   $(FCN_FILES) \
-  $(FCN_FILES_IN)
+  $(FCN_FILES_IN) \
+  $(GEN_FCN_FILES)
 
 all-local: $(GEN_FCN_FILES) $(PKG_ADD_FILES) DOCSTRINGS
 
-DOCSTRINGS: mkdoc $(FCN_FILES) $(FCN_FILES_IN) gethelp$(BUILD_EXEEXT) 
-	$(srcdir)/mkdoc "$(srcdir)" $(FCN_FILES) $(FCN_FILES_IN) > $@-t
-	$(simple_move_if_change_rule)
+DOCSTRINGS: mkdoc $(FCN_FILES) $(GEN_FCN_FILES) gethelp$(BUILD_EXEEXT) 
+	$(srcdir)/mkdoc "$(srcdir)" $(FCN_FILES) -- $(GEN_FCN_FILES) > $@-t
+	mv $@-t $@
 
 gethelp$(BUILD_EXEEXT): gethelp.cc
 	$(BUILD_CXX) $(BUILD_CXXFLAGS) -o $@ $^ $(BUILD_LDFLAGS)
diff --git a/src/ChangeLog b/src/ChangeLog
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2009-12-08  John W. Eaton  <jwe@octave.org>
+
+	* Makefile.am (gendoc.cc): Don't pass $(srcdidr) to mkgendoc.
+
 2009-12-07  John W. Eaton  <jwe@octave.org>
 
 	* OPERATORS/op-b-b.cc, OPERATORS/op-b-bm.cc,
diff --git a/src/Makefile.am b/src/Makefile.am
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -629,7 +629,7 @@
 	mv $@-t $@
 
 gendoc.cc: doc-files mkgendoc
-	$(srcdir)/mkgendoc $(srcdidr) doc-files > $@-t
+	$(srcdir)/mkgendoc doc-files > $@-t
 	mv $@-t $@
 
 gendoc$(BUILD_EXEEXT): gendoc.cc