--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Mon Oct 14 11:09:12 1996  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* octMakefile.in (maintainer-clean distclean): Remove mkoctfile too.
+	(kpathsea.info): New target.
+	(dist-info-files): New target.
+	(links-for-dist, links-for-bin-dist, local-dist-tar):
+	Depend on dist-info-files instead of individual files.
+
 Sat Oct 12 00:17:06 1996  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* examples/Makefile.in (clean, mostlyclean): New targets.

--- a/kpathsea/ChangeLog
+++ b/kpathsea/ChangeLog
@@ -1,3 +1,8 @@
+Mon Oct 14 11:10:41 1996  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* Makefile.in (distclean): Also remove libkpathsea.a and
+	libkpathsea.$(SHLEXT).
+
 Mon Jun 24 02:33:27 1996  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* Makefile.in (install): Use INSTALL_PROGRAM instead of

--- a/kpathsea/Makefile.in
+++ b/kpathsea/Makefile.in
@@ -212,6 +212,7 @@
 	rm -f kpsewhich
 distclean::
 	rm -f paths.h texmf.cnf texmf.sed so_locations
+	rm -f libkpathsea.a libkpathsea.$(SHLEXT)
 
 ac_include ../make/rdepend.make
 absolute.o: absolute.c $(kpathsea_srcdir)/config.h ./c-auto.h $(kpathsea_srcdir)/c-std.h \

--- a/libcruft/ChangeLog
+++ b/libcruft/ChangeLog
@@ -1,3 +1,7 @@
+Mon Oct 14 11:07:25 1996  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* Makefile.in (distclean): Remove stamp-shared too.
+
 Sat Oct 12 00:20:41 1996  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* Makefile.in (maintainer-clean): Don't depend on distclean.

--- a/libcruft/Makefile.in
+++ b/libcruft/Makefile.in
@@ -107,7 +107,7 @@
 	if $(SHARED_LIBS); then rm -f *.$(SHLEXT); fi
 
 distclean::
-	rm -f *.a *.o Makefile Makerules so_locations
+	rm -f *.a *.o Makefile Makerules so_locations stamp-shared
 	if $(SHARED_LIBS); then rm -f *.$(SHLEXT); fi
 
 maintainer-clean::

--- a/octMakefile.in
+++ b/octMakefile.in
@@ -75,6 +75,10 @@
 	cd test; $(MAKE) check
 .PHONY: check
 
+kpathsea.info:
+	cd kpathsea ; $(MAKE) kpathsea.info
+.PHONY: kpathsea.info
+
 octave.info:
 	cd doc/interpreter ; $(MAKE) octave.info
 .PHONY: octave.info
@@ -112,8 +116,9 @@
 .PHONY: clean mostlyclean distclean maintainer-clean
 
 maintainer-clean distclean::
-	rm -f octMakefile octave-bug Makefile Makeconf config.cache \
-	config.h config.log config.status Makerules.f77 mk-oct-links
+	rm -f octMakefile octave-bug Makefile Makeconf config.cache
+	rm -f config.h config.log config.status Makerules.f77
+	rm -f mk-oct-links mkoctfile
 
 # Now that things are under RCS control, we need to do the recursive
 # chmod so that the distributed files end up with reasonable modes.
@@ -145,7 +150,10 @@
 
 # Rules for making a source distribution.
 
-links-for-dist: octave.info INSTALL.OCTAVE BUGS
+dist-info-files: octave.info INSTALL.OCTAVE BUGS kpathsea.info
+.PHONY: dist-info-files
+
+links-for-dist: dist-info-files
 	echo octave-$(version) > .fname
 	rm -rf `cat .fname`
 	mkdir `cat .fname`
@@ -168,7 +176,7 @@
 
 # Rules for making a binary distribution.
 
-links-for-bin-dist: octave.info INSTALL.OCTAVE BUGS
+links-for-bin-dist: dist-info-files
 	echo octave-$(version) > .fname
 	rm -rf `cat .fname`
 	mkdir `cat .fname`
@@ -211,7 +219,7 @@
 
 # Rules for making a distribution for local use.
 
-local-dist-tar: octave.info INSTALL.OCTAVE BUGS
+local-dist-tar: dist-info-files
 	echo octave-local-$(version) > .fname
 	rm -rf `cat .fname`
 	mkdir `cat .fname`

--- a/readline/ChangeLog
+++ b/readline/ChangeLog
@@ -1,3 +1,8 @@
+Mon Oct 14 11:08:04 1996  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* Makefile.in (clean targets): Remove stamp-history and
+	stamp-readline too.
+
 Sat Oct 12 18:36:13 1996  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* Makefile.in (clean targets): Don't depend on clean.

--- a/readline/Makefile.in
+++ b/readline/Makefile.in
@@ -210,6 +210,7 @@
 
 clean maintainer-clean realclean distclean mostlyclean::
 	$(RM) -f $(OBJECTS) libreadline.a libhistory.a pic/*.o
+	$(RM) -f stamp-history stamp-readline
 	(if [ -d doc ]; then cd doc; $(MAKE) $(MFLAGS) $@; fi)
 	(if [ -d examples ]; then cd examples; $(MAKE) $(MFLAGS) $@; fi)
 	if $(SHARED_LIBS); then rm -f *.$(SHLEXT); fi

--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+Mon Oct 14 11:05:24 1996  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* Makefile (distclean): Remove *.oct too.
+
+	* defun-int.h: Include variables.h here.
+
 Sun Oct 13 10:52:28 1996  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* variables.cc (print_symbol_info_line): Never print negative

--- a/src/defun-int.h
+++ b/src/defun-int.h
@@ -23,6 +23,8 @@
 #if !defined (octave_defun_int_h)
 #define octave_defun_int_h 1
 
+#include "variables.h"
+
 // MAKE_BUILTINS is defined to extract function names and related
 // information and create the *.def files that are eventually used to
 // create the buitlins.cc file.