--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2001-04-25  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* octMakefile.in (install, install-strip): Don't use mk-includedir-link
+
+	* Makeconf.in (mk-includedir-link, mk-libdir-link): Delete definitions.
+
+2001-04-24  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* Makeconf.in (mk-libdir-link): Undo previous change
+
 2001-04-23  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* configure.in: Only check for libz if checking for HDF5 libraries.

--- a/Makeconf.in
+++ b/Makeconf.in
@@ -451,38 +451,3 @@
   -e "s;%OCTAVE_PREFIX%;\"${prefix}\";"
 $(top_srcdir)/move-if-change $@.tmp $@
 endef
-
-# Make a relative symbolic link from $includedir/octave to
-# $octincludedir/octave.
-
-# XXX FIXME XXX -- this assumes that $octincludedir is a subdirectory
-# of $includedir.
-
-define mk-includedir-link
-src=`echo $(octincludedir)/octave | sed 's|^$(includedir)/*||'`; \
-echo $$src; \
-if [ "$$src" = "octave" ]; then \
-  true; \
-else \
-  cd $(includedir); \
-  rm -f octave; \
-  $(LN_S) $$src octave; \
-fi
-endef
-
-# Make a relative symbolic link from $libdir/octave to $octlibdir. 
-
-# XXX FIXME XXX -- this assumes that $octlibdir is a subdirectory
-# of $libdir.
-
-define mk-libdir-link
-src=`echo $(octlibdir) | sed 's|^$(libdir)/*||'` ; \
-echo $$src ; \
-if [ "$$src" = "octave" ] ; then \
-  true ; \
-else \
-  cd $(libdir) ; \
-  rm -f octave ; \
-  $(LN_S) $$src octave ; \
-fi
-endef

--- a/libcruft/ChangeLog
+++ b/libcruft/ChangeLog
@@ -1,3 +1,7 @@
+2001-04-25  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* Makefile.in (install): Don't use mk-libdir-link.
+
 2001-04-19  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* misc/Makefile.in (CPICDEP): Remove pic/dostop.o from the list.

--- a/libcruft/Makefile.in
+++ b/libcruft/Makefile.in
@@ -127,7 +127,6 @@
 	  rm -f libcruft.$(SHLEXT); \
 	  $(LN_S) libcruft.$(SHLEXT_VER) libcruft.$(SHLEXT); \
 	fi
-	$(mk-libdir-link)
 
 install-strip::
 	$(MAKE) INSTALL_PROGRAM="$(INSTALL_PROGRAM) -s" install

--- a/liboctave/ChangeLog
+++ b/liboctave/ChangeLog
@@ -1,3 +1,8 @@
+2001-04-25  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* Makefile.in (install-lib): Don't use mk-libdir-link.
+	(install-inc): Don't use mk-includedir-link.
+
 2001-02-28  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* lo-cutils.c (octave_gethostname): New function.

--- a/liboctave/Makefile.in
+++ b/liboctave/Makefile.in
@@ -202,7 +202,6 @@
 	  rm -f liboctave.$(SHLEXT); \
 	  $(LN_S) liboctave.$(SHLEXT_VER) liboctave.$(SHLEXT); \
 	fi
-	$(mk-libdir-link)
 .PHONY: install-lib
 
 install-inc:
@@ -211,7 +210,6 @@
 	  rm -f $(octincludedir)/octave/$$f; \
 	  $(INSTALL_DATA) $(srcdir)/$$f $(octincludedir)/octave/$$f; \
 	done
-	$(mk-includedir-link)
 .PHONY: install-inc
 
 uninstall:

--- a/octMakefile.in
+++ b/octMakefile.in
@@ -111,7 +111,6 @@
 	$(INSTALL_SCRIPT) mkoctfile $(bindir)/mkoctfile-$(version)
 	cd $(bindir); $(LN_S) mkoctfile-$(version) mkoctfile
 	$(INSTALL_DATA) config.h $(octincludedir)/octave/config.h
-	$(mk-includedir-link)
 
 maintainer-clean::
 	@echo ""

--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2001-04-25  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* Makefile.in (install-lib): Don't use mk-libdir-link.
+	(install-inc): Don't use mk-includedir-link.
+
 2001-04-19  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* parse.y (fold (tree_binary_expression *)):

--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -358,7 +358,6 @@
 	  rm -f liboctinterp.$(SHLEXT); \
 	  $(LN_S) liboctinterp.$(SHLEXT_VER) liboctinterp.$(SHLEXT); \
 	fi
-	$(mk-libdir-link)
 .PHONY: install-lib
 
 install-inc:
@@ -375,7 +374,6 @@
 	    $(INSTALL_DATA) $(srcdir)/$$f $(octincludedir)/octave/$$f ; \
 	  fi ; \
 	done
-	$(mk-includedir-link)
 .PHONY: install-inc
 
 uninstall:

--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,6 +1,7 @@
 2001-04-24  Christoph Spiel <cspiel@hammersmith-consulting.com>
 
 	* Makefile.in (check): Allow user to specify which .exp file to run.
+	* octave.test/try, octave.test/eval-catch: New directories and tests.
 
 2000-06-07  Ben Sapp <bsapp@nua.lampf.lanl.gov>