Mercurial > octave
view etc/module.mk @ 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 | d664734ce8eb |
children | 00d42b86d0a5 |
line wrap: on
line source
%canon_reldir%_EXTRA_DIST = %canon_reldir%_CLEANFILES = %canon_reldir%_DISTCLEANFILES = %canon_reldir%_MAINTAINERCLEANFILES = %canon_reldir%_EXTRA_DIST += \ %reldir%/NEWS.1 \ %reldir%/NEWS.2 \ %reldir%/NEWS.3 \ %reldir%/PROJECTS \ %reldir%/gdbinit %canon_reldir%_EXTRA_DIST += \ %reldir%/OLD-ChangeLogs/ChangeLog \ %reldir%/OLD-ChangeLogs/ChangeLog.1 \ %reldir%/OLD-ChangeLogs/doc-ChangeLog \ %reldir%/OLD-ChangeLogs/libcruft-ChangeLog \ %reldir%/OLD-ChangeLogs/liboctave-ChangeLog \ %reldir%/OLD-ChangeLogs/scripts-ChangeLog \ %reldir%/OLD-ChangeLogs/src-ChangeLog \ %reldir%/OLD-ChangeLogs/test-ChangeLog fallback_FONT_FILES = \ %reldir%/fonts/FreeSans.otf \ %reldir%/fonts/FreeSansBold.otf \ %reldir%/fonts/FreeSansBoldOblique.otf \ %reldir%/fonts/FreeSansOblique.otf octfonts_DATA += \ $(fallback_FONT_FILES) %canon_reldir%_EXTRA_DIST += \ $(fallback_FONT_FILES) appdatadir = $(datadir)/metainfo appdata_DATA = \ %reldir%/icons/org.octave.Octave.appdata.xml desktopdir = $(datadir)/applications desktop_DATA = \ %reldir%/icons/org.octave.Octave.desktop icon_IMAGE_FILES = \ %reldir%/icons/octave-logo.svg \ %reldir%/icons/octave-sombrero.png icon_PNG_SIZES = \ 512 \ 256 \ 128 \ 64 \ 48 \ 32 \ 24 \ 22 \ 16 BUILT_PNG_ICONS = $(patsubst %,%reldir%/icons/octave-logo-%.png,$(icon_PNG_SIZES)) WINDOWS_PNG_ICONS = $(filter %-16.png %-32.png %-48.png %-256.png,$(BUILT_PNG_ICONS)) BUILT_ICONS = \ $(BUILT_PNG_ICONS) \ %reldir%/icons/octave-logo.ico %canon_reldir%_EXTRA_DIST += \ $(BUILT_ICONS) \ $(icon_IMAGE_FILES) \ %reldir%/icons/octave_branding_samples.svg \ %reldir%/icons/org.octave.Octave.appdata.xml \ %reldir%/icons/org.octave.Octave.desktop.in image_DATA += \ $(icon_IMAGE_FILES) \ %reldir%/icons/octave-logo.ico DIRSTAMP_FILES += \ %reldir%/icons/$(octave_dirstamp) all-local: all-icons all-icons: %reldir%/icons/org.octave.Octave.desktop $(BUILT_ICONS) %reldir%/icons/org.octave.Octave.desktop: %reldir%/icons/org.octave.Octave.desktop.in | %reldir%/icons/$(octave_dirstamp) $(AM_V_GEN)rm -f $@-t $@ && \ $(SED) < $< > $@-t \ -e "s|%OCTAVE_PREFIX%|${prefix}|" && \ mv $@-t $@ $(BUILT_PNG_ICONS): %reldir%/icons/octave-logo.svg | %reldir%/icons/$(octave_dirstamp) $(AM_V_GEN)rm -f $@-t $@ && \ $(RSVG_CONVERT) -w $(lastword $(subst -, ,$(patsubst %.png,%,$@))) $< > $@-t && \ mv $@-t $@ %reldir%/icons/octave-logo.ico: $(WINDOWS_PNG_ICONS) | %reldir%/icons/$(octave_dirstamp) $(AM_V_GEN)rm -f $@-t $@ && \ $(ICOTOOL) --create --raw $(WINDOWS_PNG_ICONS) > $@-t && \ mv $@-t $@ install-data-local: install-icons uninstall-local: uninstall-icons install-icons: for f in $(BUILT_PNG_ICONS); do \ size=`echo $$f | $(SED) -n -e "s/.*-\([0-9]\+\)\.png/\1/p"`; \ if test -f $$f; then d=; else d="$(srcdir)/"; fi; \ $(MKDIR_P) $(DESTDIR)$(datadir)/icons/hicolor/$${size}x$${size}/apps; \ $(INSTALL_DATA) "$$d$$f" $(DESTDIR)$(datadir)/icons/hicolor/$${size}x$${size}/apps/octave.png; \ done $(MKDIR_P) $(DESTDIR)$(datadir)/icons/hicolor/scalable/apps $(INSTALL_DATA) $(srcdir)/%reldir%/icons/octave-logo.svg $(DESTDIR)$(datadir)/icons/hicolor/scalable/apps/octave.svg uninstall-icons: for f in $(BUILT_PNG_ICONS); do \ size=`echo $$f | $(SED) -n -e "s/.*-\([0-9]\+\)\.png/\1/p"`; \ rm -f $(DESTDIR)$(datadir)/icons/hicolor/$${size}x$${size}/apps/octave.png; \ done rm -f $(DESTDIR)$(datadir)/icons/hicolor/scalable/apps/octave.svg EXTRA_DIST += $(%canon_reldir%_EXTRA_DIST) %canon_reldir%_CLEANFILES += \ %reldir%/icons/org.octave.Octave.desktop %canon_reldir%_MAINTAINERCLEANFILES += \ $(BUILT_ICONS) CLEANFILES += $(%canon_reldir%_CLEANFILES) DISTCLEANFILES += $(%canon_reldir%_DISTCLEANFILES) MAINTAINERCLEANFILES += $(%canon_reldir%_MAINTAINERCLEANFILES) etc-clean: rm -f $(%canon_reldir%_CLEANFILES) etc-distclean: etc-clean rm -f $(%canon_reldir%_DISTCLEANFILES) etc-maintainer-clean: etc-distclean rm -f $(%canon_reldir%_MAINTAINERCLEANFILES)