# HG changeset patch
# User jwe
# Date 825382768 0
# Node ID 88aa1d1ed4af540adc756c157e1eac3d40861bf6
# Parent  d7d22af7dbd3bd45cf137025b93a00fd9452465c
[project @ 1996-02-27 00:58:19 by jwe]

diff --git a/configure.in b/configure.in
--- a/configure.in
+++ b/configure.in
@@ -20,7 +20,7 @@
 ### along with Octave; see the file COPYING.  If not, write to the Free
 ### Software Foundation, 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-AC_REVISION($Revision: 1.166 $)
+AC_REVISION($Revision: 1.167 $)
 AC_PREREQ(2.0)
 AC_INIT(src/octave.cc)
 AC_CONFIG_HEADER(config.h)
@@ -48,7 +48,7 @@
 datadir='$(prefix)/share'
 libdir='$(exec_prefix)/lib'
 libexecdir='$(exec_prefix)/libexec'
-includedir='$(prefix)/include/octave'
+includedir='$(prefix)/include/octave-$(version)'
 mandir='$(prefix)/man/man1'
 infodir='$(prefix)/info'
 fcnfiledir='$(datadir)/octave/$(version)/m'
diff --git a/liboctave/Makefile.in b/liboctave/Makefile.in
--- a/liboctave/Makefile.in
+++ b/liboctave/Makefile.in
@@ -151,6 +151,13 @@
 	  rm -f $(includedir)/$$f ; \
 	  $(INSTALL_DATA) $(srcdir)/$$f $(includedir)/$$f ; \
 	done
+	linkdir=`echo $(includedir) | sed 's/-$(version)$$//'` ; \
+	if [ "$$linkdir" = $(includedir) ] ; then \
+	  true ; \
+	else \
+	  rm -rf $$linkdir ; \
+	fi ; \
+	$(LN_S) $(includedir) $$linkdir
 .PHONY: install
 
 uninstall:
diff --git a/src/variables.cc b/src/variables.cc
--- a/src/variables.cc
+++ b/src/variables.cc
@@ -1369,7 +1369,7 @@
 
   int argc = tmp_args.length () + 1;
 
-  string_vector argv = args.make_argv ("whos");
+  string_vector argv = tmp_args.make_argv ("whos");
 
   if (error_state)
     return retval;