Mercurial > octave-nkf

comparison src/defaults.in.h @ 14614:4e9dc46d4125

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
handle texinfo macros consistently in help system and manual * macros.texi: New file. Move macro definitions here from octave.texi. * doc/interpreter/Makefile.am (octetc_DATA): Include it in the list. (doc-cache): Pass macros.texi to mk_doc_cache.m. * octave.texi: Include macros.texi. * mk_doc_cache.m, __makeinfo__.m: Copy macros file to makeinfo input instead of handling macros specially. * configure.ac (texi_macros_file): New variable. * build-aux/common.mk (texi_macros_file, do_subst_default_vals): Substitute it. * run-octave.in (TEXIMACROSFILE): New variable. Pass --texi-macros-file to Octave. * defaults.in.h (OCTAVE_DEFAULT_TEXI_MACROS_FILE): New variable. * default.cc (set_default_texi_macros_file): New function. (install_defaults): Call it. * help.cc (Vtexi_macros_file): New variable. (Ftexi_macros_file): New function. * help.h (Vtexi_macros_file): Provide decl. * octave.cc (TEXI_MACROS_FILE_OPTION): New long option value. (long_opts): Include --texi-macros-file in the list. (octave_main): Handle TEXI_MACROS_FILE_OPTION.
author John W. Eaton <jwe@octave.org>
date Thu, 10 May 2012 12:01:42 -0400
parents 1bf39e944e43
children
comparison
equal deleted inserted replaced
14613:e7c8e31f8e5d 14614:4e9dc46d4125
52 #define OCTAVE_DATAROOTDIR %OCTAVE_DATAROOTDIR% 52 #define OCTAVE_DATAROOTDIR %OCTAVE_DATAROOTDIR%
53 #endif 53 #endif
54 54
55 #ifndef OCTAVE_DOC_CACHE_FILE 55 #ifndef OCTAVE_DOC_CACHE_FILE
56 #define OCTAVE_DOC_CACHE_FILE %OCTAVE_DOC_CACHE_FILE% 56 #define OCTAVE_DOC_CACHE_FILE %OCTAVE_DOC_CACHE_FILE%
57 #endif
58
59 #ifndef OCTAVE_TEXI_MACROS_FILE
60 #define OCTAVE_TEXI_MACROS_FILE %OCTAVE_TEXI_MACROS_FILE%
57 #endif 61 #endif
58 62
59 #ifndef OCTAVE_EXEC_PREFIX 63 #ifndef OCTAVE_EXEC_PREFIX
60 #define OCTAVE_EXEC_PREFIX %OCTAVE_EXEC_PREFIX% 64 #define OCTAVE_EXEC_PREFIX %OCTAVE_EXEC_PREFIX%
61 #endif 65 #endif