--- a/ChangeLog	Mon Dec 09 19:16:38 1996 +0000
+++ b/ChangeLog	Mon Dec 09 20:28:14 1996 +0000
@@ -1,7 +1,13 @@
 Mon Dec  9 11:28:27 1996  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
+	* configure.in: Substitute EXE.  On cygwin32 systems, set it to .exe.
+	* Makeconf.in (EXE): Add definition.
+
+	* configure.in: On cygwin32 systems, set default to disable GNU info.
+
 	* aclocal.m4 (OCTAVE_STRING_NPOS): New macro.
 	* configure.in: Call it.
+
 	* acconfig.h: Add undef for NPOS.
 	* config.h.bot: Remove kluge for deciding whether to define NPOS.
 

--- a/Makeconf.in	Mon Dec 09 19:16:38 1996 +0000
+++ b/Makeconf.in	Mon Dec 09 20:28:14 1996 +0000
@@ -11,6 +11,8 @@
 
 #### Start of system configuration section. ####
 
+EXE = @EXE@
+
 LEX = @LEX@
 LFLAGS = @LFLAGS@
 LEXLIB = @LEXLIB@

--- a/configure.in	Mon Dec 09 19:16:38 1996 +0000
+++ b/configure.in	Mon Dec 09 20:28:14 1996 +0000
@@ -21,7 +21,7 @@
 ### Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 ### 02111-1307, USA. 
 
-AC_REVISION($Revision: 1.239 $)
+AC_REVISION($Revision: 1.240 $)
 AC_PREREQ(2.9)
 AC_INIT(src/octave.cc)
 AC_CONFIG_HEADER(config.h)
@@ -140,8 +140,16 @@
 
 ### Allow the user disable support for GNU info.
 
+case "$canonical_host_type" in
+  *-*-cygwin32)
+    USE_GNU_INFO=false
+  *)
+    USE_GNU_INFO=true
+  ;;
+esac
+
 INFO_DIR=info
-USE_GNU_INFO=true
+
 AC_ARG_ENABLE(info,
   [  --enable-info           use GNU info (default is yes)],
   [if test $enableval = no; then
@@ -1004,6 +1012,14 @@
 
 AC_PROG_INSTALL
 
+EXE=
+case "$canonical_host_type" in
+  *-*-cygwin32)
+    EXE=.exe
+  ;;
+esac
+AC_SUBST(EXE);
+
 AC_CHECK_PROG(GNUPLOT_BINARY, gnuplot, gnuplot, [])
 if test -n "$GNUPLOT_BINARY"; then
   AC_MSG_CHECKING([to see if your gnuplot supports multiplot])

--- a/info/ChangeLog	Mon Dec 09 19:16:38 1996 +0000
+++ b/info/ChangeLog	Mon Dec 09 20:28:14 1996 +0000
@@ -1,3 +1,8 @@
+Mon Dec  9 14:20:01 1996  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* Makefile.in (install): Use $(EXE) suffix so that install will
+	find the right file on cygwin32 systems.
+
 Mon Dec  2 13:48:57 1996  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* configure.in: Check for gethostname in libsocket.a, for SCO.

--- a/info/Makefile.in	Mon Dec 09 19:16:38 1996 +0000
+++ b/info/Makefile.in	Mon Dec 09 20:28:14 1996 +0000
@@ -1,5 +1,5 @@
 # Makefile for texinfo/info.	-*- Indented-Text -*-
-# $Id: Makefile.in,v 1.33 1996-11-14 08:39:43 jwe Exp $
+# $Id: Makefile.in,v 1.34 1996-12-09 20:28:14 jwe Exp $
 # 
 # Copyright (C) 1993,96 Free Software Foundation, Inc.
 
@@ -112,7 +112,7 @@
 
 install:
 	$(top_srcdir)/mkinstalldirs $(archlibdir)
-	$(INSTALL_PROGRAM) info $(archlibdir)/info
+	$(INSTALL_PROGRAM) info$(EXE) $(archlibdir)/info$(EXE)
 
 uninstall:
 	rm -f $(archlibdir)/info

--- a/src/ChangeLog	Mon Dec 09 19:16:38 1996 +0000
+++ b/src/ChangeLog	Mon Dec 09 20:28:14 1996 +0000
@@ -1,5 +1,8 @@
 Mon Dec  9 12:03:45 1996  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
+	* Makefile.in (install-bin): Use $(EXE) suffix so install will
+	find the right file on cygwin32 systems.
+
 	* ov.h: Declare proper form of do_binary_op as friend to
 	octave_value class.
 

--- a/src/Makefile.in	Mon Dec 09 19:16:38 1996 +0000
+++ b/src/Makefile.in	Mon Dec 09 20:28:14 1996 +0000
@@ -253,8 +253,8 @@
 install-bin:
 	$(top_srcdir)/mkinstalldirs $(bindir)
 	rm -f $(bindir)/octave
-	$(INSTALL_PROGRAM) octave $(bindir)/octave-$(version)
-	$(LN_S) $(bindir)/octave-$(version) $(bindir)/octave
+	$(INSTALL_PROGRAM) octave$(EXE) $(bindir)/octave-$(version)$(EXE)
+	$(LN_S) $(bindir)/octave-$(version)$(EXE) $(bindir)/octave$(EXE)
 .PHONY: install-bin
 
 install-oct: mk-oct-links
@@ -297,7 +297,7 @@
 .PHONY: install-lib
 
 uninstall:
-	rm -f $(bindir)/octave
+	rm -f $(bindir)/octave$(EXE)
 	for f in $(LIBS_TO_INSTALL); do rm -f $(libdir)/$$f; done
 	for f in $(SH_LIBS_TO_INSTALL); do rm -f $(libdir)/$$f; done
 	for f in $(INCLUDES) defaults.h oct-conf.h; do \