* Allow setting the font directory using --datadir / --datarootdir.

This commit is contained in:
Sam Hocevar 2006-11-10 14:30:22 +00:00 committed by sam
parent 9428fa4d2f
commit 67988bb31f
5 changed files with 6 additions and 4 deletions

View file

@ -77,5 +77,6 @@ AC_OUTPUT([
tools/Makefile
fonts/Makefile
doc/Makefile
doc/toilet.1
])

View file

@ -1,6 +1,6 @@
# $Id: Makefile.am 871 2006-09-25 15:58:33Z sam $
EXTRA_DIST = $(man_MANS)
EXTRA_DIST = toilet.1.in
man_MANS = toilet.1

View file

@ -55,7 +55,7 @@ Use the given font instead of the default value. Fonts are
or
.B .tlf
files stored in the
.B /usr/share/figlet
.B @datarootdir@/figlet
directory. There is also a special built-in font called
.I term
that serves as a fallback if no font is available.
@ -63,7 +63,7 @@ that serves as a fallback if no font is available.
.B \-d, \-\-directory <dir>
Specify the directory in which to look for fonts. The default value is set
at build time and usually defaults to
.B /usr/share/figlet.
.B @datarootdir@/figlet.
.TP
.B \-w, \-\-width <width>
Set the output width. By default,

View file

@ -7,6 +7,7 @@ toilet_SOURCES = main.c toilet.h \
filter.c filter.h \
export.c export.h \
term.c figlet.c
toilet_CPPFLAGS = -DFONTDIR=\"$(datadir)/figlet\"
toilet_CFLAGS = `pkg-config --cflags cucul`
toilet_LDFLAGS = `pkg-config --libs cucul` @GETOPT_LIBS@ @ZLIB_LIBS@

View file

@ -50,7 +50,7 @@ int main(int argc, char *argv[])
cx->export = "utf8";
cx->font = "smblock";
cx->dir = "/usr/share/figlet/";
cx->dir = FONTDIR;
cx->term_width = 80;