Mercurial > octave
diff Makefile.am @ 24899:1a46d174a483 stable
include a proper definition of Octave's private font fallback directory
* configure.ac (octfontsdir): New variable.
* Makefile.am (octfonts_DATA): New variable.
* etc/module.mk (fallback_FONT_FILES): New variable. (octfonts_DATA): Include
it in the list. (%canon_reldir%_EXTRA_DIST): Likewise. (etc_fontsdir): Delete.
* subst-default-vals.in.sh: Substitute octfontsdir for OCTAVE_OCTFONTSDIR.
* default-defs.in.h (OCTAVE_OCTFONTSDIR): New macro.
* defaults.cc, defaults.h (Voct_fonts_dir): New variable. (init_defaults):
Initialize it. (config::oct_fonts_dir): New function.
* toplev.cc: (F__octave_config_info__): Include "octfontsdir" in the struct.
* octave-config.in.cc (help_msg, initialize): Include OCTFONTSDIR in the list.
* ft-text-renderer.cc (ft_manager::do_get_font): Use config::oct_fonts_dir.
Use environment variable name OCTAVE_FONTS_DIR for consistency.
* run-octave.in (OCTAVE_FONTS_DIR): Rename for consistency.
author | Mike Miller <mtmiller@octave.org> |
---|---|
date | Fri, 16 Mar 2018 15:28:34 -0700 |
parents | 92aaa85c06b8 |
children | 6652d3823428 |
line wrap: on
line diff