From 48de3d14c338c1a404accdf6551d32afb964ea1e Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Wed, 29 Mar 2017 00:49:52 +0200 Subject: [PATCH] Add font directory environment variable Adds a variable to specify the location where the font will be installed. In this patch I chose to use /usr/share/consolefonts as the default, though on my openSUSE system it will be /usr/share/kbd/consolefonts. Maybe it varies between distros, so its good to have a variable. Example usage: FONT_DIR="/usr/share/kbd/consolefonts" ./configure && make && make install Fixes https://github.com/karlstav/cava/issues/147 --- Makefile.am | 2 +- configure.ac | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index cc8c48f..aac9351 100644 --- a/Makefile.am +++ b/Makefile.am @@ -15,7 +15,7 @@ cava_CPPFLAGS = -DPACKAGE=\"$(PACKAGE)\" -DVERSION=\"$(VERSION)\" \ -D_POSIX_SOURCE -D _POSIX_C_SOURCE=200809L cava_CFLAGS = -std=c99 -Wall -Wextra -Wno-unused-result -Wno-maybe-uninitialized -cava_font_dir = /usr/share/consolefonts +cava_font_dir = @FONT_DIR@ cava_font__DATA = cava.psf if !SYSTEM_LIBINIPARSER diff --git a/configure.ac b/configure.ac index 3f0a247..6e3c291 100644 --- a/configure.ac +++ b/configure.ac @@ -149,6 +149,14 @@ AS_IF([test "x$enable_legacy_iniparser" = "xyes"], [ CPPFLAGS="$CPPFLAGS -DLEGACYINIPARSER" ]) +dnl ############################ +dnl Set font directory +dnl ############################ +DEFAULT_FONT_DIR="/usr/share/consolefonts" +AC_ARG_VAR(FONT_DIR, [Directory where the font will be installed.]) +if test -z "$FONT_DIR" ; then + FONT_DIR="$DEFAULT_FONT_DIR" +fi