diff options
| author | Egbert Eich <eich@freedesktop.org> | 2011-05-19 17:50:35 +0200 |
|---|---|---|
| committer | Egbert Eich <eich@freedesktop.org> | 2013-07-31 12:48:59 +0200 |
| commit | bf0b2812b020cd338cba2e235132b97021a6f9e3 (patch) | |
| tree | 55855bc6d1845a506bbd56c4752116120112f794 | |
| parent | dc0fe3761a074b5884bec91edde1babdf45cc95b (diff) | |
install: Make fonttypes to be installed configurable
This package contains two font versions: TrueType and OpenType.
One may want to install only one of them and (re)generate font.scale
for this introduce two new config options:
--disable-opentype-install and --disable-truetype-install.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Egbert Eich <eich@freedesktop.org>
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 11 |
2 files changed, 15 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index 1903423..b9705a7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -33,14 +33,18 @@ EXTRA_DIST = $(ttffont_DATA) $(otffont_DATA) license.txt MAINTAINERCLEANFILES = ChangeLog INSTALL install-data-hook: +if INSTALL_TTF @rm -f $(DESTDIR)$(ttffontdir)/fonts.scale $(MKFONTSCALE) $(DESTDIR)$(ttffontdir) @rm -f $(DESTDIR)$(ttffontdir)/font.dir $(MKFONTDIR) $(DESTDIR)$(ttffontdir) +endif +if INSTALL_OTF @rm -f $(DESTDIR)$(otffontdir)/fonts.scale $(MKFONTSCALE) $(DESTDIR)$(otffontdir) @rm -f $(DESTDIR)$(otffontdir)/font.dir $(MKFONTDIR) $(DESTDIR)$(otffontdir) +endif @RUN_FCCACHE@ distuninstallcheck: diff --git a/configure.ac b/configure.ac index bc57d12..b78fe98 100644 --- a/configure.ac +++ b/configure.ac @@ -34,6 +34,17 @@ m4_ifndef([XORG_MACROS_VERSION], XORG_MACROS_VERSION(1.3) XORG_DEFAULT_OPTIONS +AC_ARG_ENABLE(truetype-install, + AS_HELP_STRING([--disable-truetype-install], + [Disable install of truetype fonts (default: enabled)]), + [install_ttf=$enableval], [install_ttf=yes]) +AM_CONDITIONAL(INSTALL_TTF, [test "x$install_ttf" = xyes]) +AC_ARG_ENABLE(opentype-install, + AS_HELP_STRING([--disable-opentype-install], + [Disable install of opentype fonts (default: enabled)]), + [install_otf=$enableval], [install_otf=yes]) +AM_CONDITIONAL(INSTALL_OTF, [test "x$install_otf" = xyes]) + AC_PROG_INSTALL # Require X.Org's font util macros 1.2 or later |