# HG changeset patch
# User dbateman
# Date 1128498891 0
# Node ID d2df058c4319b119568adcda125c4fe58eb4089a
# Parent  6bbfc37975d2d28aafa292d547251c7cbf681142
[project @ 2005-10-05 07:52:10 by dbateman]

diff -r 6bbfc37975d2 -r d2df058c4319 ChangeLog
--- a/ChangeLog	Tue Oct 04 17:17:31 2005 +0000
+++ b/ChangeLog	Wed Oct 05 07:54:51 2005 +0000
@@ -1,3 +1,7 @@
+2005-10-05  David Bateman  <dbateman@free.fr>
+
+	 mkoctfile.in: allow -idirafter argument.
+
 2005-09-23  John W. Eaton  <jwe@octave.org>
 
 	* examples/Makefile.in (install install-strip):
diff -r 6bbfc37975d2 -r d2df058c4319 mkoctfile.in
--- a/mkoctfile.in	Tue Oct 04 17:17:31 2005 +0000
+++ b/mkoctfile.in	Wed Oct 05 07:54:51 2005 +0000
@@ -132,6 +132,8 @@
 
   -IDIR                   Add -IDIR to compile commands.
 
+  -idirafter DIR          Add -idirafter DIR to compile commands.
+
   -DDEF                   Add -DDEF to compile commands.
 
   -lLIB                   Add library LIB to link command.
@@ -194,6 +196,14 @@
     -I*)
       incflags="$incflags $1"
     ;;
+    -idirafter)
+      shift
+      if [ $# -gt 0 ]; then
+        incflags="$incflags -idirafter $1"
+      else
+        echo "mkoctfile: include directory name misisng name missing" 1>&2
+      fi
+    ;;
     -D*)
       defs="$defs $1"
     ;;
diff -r 6bbfc37975d2 -r d2df058c4319 src/ChangeLog
--- a/src/ChangeLog	Tue Oct 04 17:17:31 2005 +0000
+++ b/src/ChangeLog	Wed Oct 05 07:54:51 2005 +0000
@@ -1,3 +1,7 @@
+2005-10-05  David Bateman  <dbateman@free.fr>
+
+	* help.cc (try_info): format in command string for mingw.
+
 2005-09-30  John W. Eaton  <jwe@octave.org>
 
 	* ov.cc (octave_value::~octave_value): No need to set rep to zero
diff -r 6bbfc37975d2 -r d2df058c4319 src/help.cc
--- a/src/help.cc	Tue Oct 04 17:17:31 2005 +0000
+++ b/src/help.cc	Wed Oct 05 07:54:51 2005 +0000
@@ -557,7 +557,11 @@
 
   OSSTREAM cmd_buf;
 
+#if __MINGW32__
+  cmd_buf << Vinfo_prog << " --file \"" << Vinfo_file << "\"";
+#else
   cmd_buf << "\"" << Vinfo_prog << "\" --file \"" << Vinfo_file << "\"";
+#endif
 
   std::string directory_name = Vinfo_file;
   size_t pos = directory_name.rfind ('/');