Mercurial > hg > octave-lyh
changeset 5483:d2df058c4319
[project @ 2005-10-05 07:52:10 by dbateman]
| author | dbateman |
|---|---|
| date | Wed, 05 Oct 2005 07:54:51 +0000 |
| parents | 6bbfc37975d2 |
| children | 2ff5363a16bd |
| files | ChangeLog mkoctfile.in src/ChangeLog src/help.cc |
| diffstat | 4 files changed, 22 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -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):
--- a/mkoctfile.in +++ b/mkoctfile.in @@ -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" ;;
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -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
--- a/src/help.cc +++ b/src/help.cc @@ -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 ('/');