# HG changeset patch
# User jwe
# Date 1161789101 0
# Node ID 4278b170b9f9b505197e9824255102cf7441f97a
# Parent  76e3715e31dbc83c58327814b919b62e7b5777de
[project @ 2006-10-25 15:11:40 by jwe]

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-10-25  John W. Eaton  <jwe@octave.org>
+
+	* mkoctfile.in (OCTAVE_VERSION): No need to quote replacement here.
+
 2006-10-24  John W. Eaton  <jwe@octave.org>
 
 	* run-octave.in: Only modify .gdbinit if -g option is given.
diff --git a/mkoctfile.in b/mkoctfile.in
--- a/mkoctfile.in
+++ b/mkoctfile.in
@@ -7,7 +7,7 @@
 
 set -e
 
-OCTAVE_VERSION="%OCTAVE_CONF_VERSION%"
+OCTAVE_VERSION=%OCTAVE_CONF_VERSION%
 
 # Default values for these variables are filled in when Octave is
 # compiled. 
diff --git a/src/ChangeLog b/src/ChangeLog
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-25  John W. Eaton  <jwe@octave.org>
+
+	* sysdep.cc (w32_set_octave_home): Correctly initialize bin_dir.
+	Fill it with '\0' instead of ' '.
+
 2006-10-24  Michael Goffioul  <michael.goffioul@swing.be>
 
 	* Makefile.in: Filter out $(XTRA_CXXDEFS) from $(ALL_CXXFLAGS) for
diff --git a/src/sysdep.cc b/src/sysdep.cc
--- a/src/sysdep.cc
+++ b/src/sysdep.cc
@@ -112,7 +112,7 @@
 #if defined (__WIN32__) && ! defined (_POSIX_VERSION)
   int n = 1024;
 
-  std::string bin_dir (' ', n);
+  std::string bin_dir (n, '\0');
 
   while (true)
     {