Mercurial > octave

comparison build-aux/common.mk @ 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 bc4c574ab3b6
children 3513df68d580
comparison
equal deleted inserted replaced
14613:e7c8e31f8e5d 14614:4e9dc46d4125
339 man1dir = @man1dir@ 339 man1dir = @man1dir@
340 man1ext = @man1ext@ 340 man1ext = @man1ext@
341 341
342 # The full path to the default doc cache file. 342 # The full path to the default doc cache file.
343 doc_cache_file = @doc_cache_file@ 343 doc_cache_file = @doc_cache_file@
344
345 # The full path to the default texi macros file.
346 texi_macros_file_file = @texi_macros_file@
344 347
345 # Where to install and expect the info files describing Octave.. 348 # Where to install and expect the info files describing Octave..
346 infodir = @infodir@ 349 infodir = @infodir@
347 350
348 # The full path to the default info file. 351 # The full path to the default info file.
630 -e "s|%OCTAVE_OCTLIBDIR%|\"${octlibdir}\"|" \ 633 -e "s|%OCTAVE_OCTLIBDIR%|\"${octlibdir}\"|" \
631 -e "s|%OCTAVE_STARTUPFILEDIR%|\"${startupfiledir}\"|" \ 634 -e "s|%OCTAVE_STARTUPFILEDIR%|\"${startupfiledir}\"|" \
632 -e "s|%OCTAVE_PREFIX%|\"${prefix}\"|" \ 635 -e "s|%OCTAVE_PREFIX%|\"${prefix}\"|" \
633 -e "s|%OCTAVE_API_VERSION%|\"${api_version}\"|" \ 636 -e "s|%OCTAVE_API_VERSION%|\"${api_version}\"|" \
634 -e "s|%OCTAVE_RELEASE%|\"${OCTAVE_RELEASE}\"|" \ 637 -e "s|%OCTAVE_RELEASE%|\"${OCTAVE_RELEASE}\"|" \
638 -e "s|%OCTAVE_TEXI_MACROS_FILE%|\"${texi_macros_file}\"|" \
635 -e "s|%OCTAVE_VERSION%|\"${version}\"|" 639 -e "s|%OCTAVE_VERSION%|\"${version}\"|"
636 $(simple_move_if_change_rule) 640 $(simple_move_if_change_rule)
637 endef 641 endef
638 642
639 define do_subst_script_vals 643 define do_subst_script_vals