# HG changeset patch
# User jwe
# Date 870640610 0
# Node ID bb05bfa835c97573663c513d70f15143baf86de5
# Parent  440a0e1b8c66e91af573b2097bb0fcdfdf61f841
[project @ 1997-08-03 20:36:49 by jwe]

diff -r 440a0e1b8c66 -r bb05bfa835c9 Makefile.in
--- a/Makefile.in	Sun Aug 03 20:17:37 1997 +0000
+++ b/Makefile.in	Sun Aug 03 20:36:50 1997 +0000
@@ -6,7 +6,7 @@
 # University of Wisconsin-Madison
 # Department of Chemical Engineering
 
-TARGETS = octave-bug mkoctfile libcruft liboctave kpathsea info dlfcn \
+TARGETS = octave-bug mkoctfile libcruft liboctave kpathsea dlfcn \
 	src scripts doc check octave.info INSTALL.OCTAVE BUGS \
 	install install-strip uninstall tags TAGS dist conf-dist \
 	snapshot snapshot-version
@@ -90,7 +90,6 @@
 	@echo ""
 	@echo "  dlfcn                make all in subdirectory dlfcn"
 	@echo "  doc                  make all in subdirectory doc"
-	@echo "  info                 make all in subdirectory info"
 	@echo "  kpathsea             make all in subdirectory kpathsea"
 	@echo "  libcruft             make all in subdirectory libcruft"
 	@echo "  liboctave            make all in subdirectory liboctave"
diff -r 440a0e1b8c66 -r bb05bfa835c9 configure.in
--- a/configure.in	Sun Aug 03 20:17:37 1997 +0000
+++ b/configure.in	Sun Aug 03 20:36:50 1997 +0000
@@ -21,7 +21,7 @@
 ### Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 ### 02111-1307, USA. 
 
-AC_REVISION($Revision: 1.282 $)
+AC_REVISION($Revision: 1.283 $)
 AC_PREREQ(2.9)
 AC_INIT(src/octave.cc)
 AC_CONFIG_HEADER(config.h)
@@ -120,19 +120,6 @@
   ;;
 esac
 
-INFO_DIR=info
-
-AC_ARG_ENABLE(info,
-  [  --enable-info           use GNU info (default is yes)],
-  [if test "$enableval" = no; then
-     USE_GNU_INFO=false;
-     INFO_DIR="";
-   fi], [])
-if $USE_GNU_INFO; then
-  AC_DEFINE(USE_GNU_INFO, 1)
-fi
-AC_SUBST(INFO_DIR)
-
 dnl ### Allow the user disable support for plplot.
 dnl 
 dnl # USE_PLPLOT=true
@@ -1183,7 +1170,7 @@
 export CXX
 export F77
 
-AC_CONFIG_SUBDIRS(glob kpathsea scripts $INFO_DIR $PLPLOT_DIR $READLINE_DIR)
+AC_CONFIG_SUBDIRS(glob kpathsea scripts $PLPLOT_DIR $READLINE_DIR)
 
 ### Do the substitutions in all the Makefiles.
 
diff -r 440a0e1b8c66 -r bb05bfa835c9 install-octave
--- a/install-octave	Sun Aug 03 20:17:37 1997 +0000
+++ b/install-octave	Sun Aug 03 20:36:50 1997 +0000
@@ -210,10 +210,6 @@
 cp octave-bug $bindir/octave-bug
 chmod 755 $bindir/octave-bug
 
-echo "installing info as $archlibdir/info"
-cp info/info $archlibdir/info
-chmod 755 $archlibdir/info
-
 if test -f LIBRARIES; then
   echo "installing shared libraries in $libdir"
   for f in `cat LIBRARIES`
diff -r 440a0e1b8c66 -r bb05bfa835c9 octMakefile.in
--- a/octMakefile.in	Sun Aug 03 20:17:37 1997 +0000
+++ b/octMakefile.in	Sun Aug 03 20:36:50 1997 +0000
@@ -45,7 +45,7 @@
 CONF_DISTSUBDIRS = src
 
 # Subdirectories in which to run `make dist'.
-DISTSUBDIRS = libcruft liboctave info dlfcn src scripts \
+DISTSUBDIRS = libcruft liboctave dlfcn src scripts \
 	test doc emacs examples
 
 XBINDISTFILES = BUGS COPYING INSTALL INSTALL.OCTAVE NEWS NEWS.[0-9] \
@@ -57,7 +57,7 @@
 	octave-bug config.status config.h VERSION ARCH
 
 # Subdirectories in which to run `make bin-dist'.
-BINDISTSUBDIRS = libcruft liboctave src info scripts doc emacs examples
+BINDISTSUBDIRS = libcruft liboctave src scripts doc emacs examples
 
 # Subdirectories in which to run clean targets.
 CLEANSUBDIRS = $(DISTSUBDIRS) glob kpathsea
@@ -243,7 +243,7 @@
 	find `cat .fname` \( -perm 766 -o -perm 676 -o -perm 667 \
 	  -o -perm 776 -o -perm 677 -o -perm 767 \) -print | \
 	  xargs chmod a+x scripts
-	strip src/octave info/info
+	strip src/octave
 	tar cf `cat .fname`.tar `cat .fname`
 	rm -rf `cat .fname`
 	gzip --best `cat .fname`.tar