Ver código fonte

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

pull/1/head
Sam Hocevar sam 18 anos atrás
pai
commit
67988bb31f
5 arquivos alterados com 6 adições e 4 exclusões
  1. +1
    -0
      configure.ac
  2. +1
    -1
      doc/Makefile.am
  3. +2
    -2
      doc/toilet.1.in
  4. +1
    -0
      src/Makefile.am
  5. +1
    -1
      src/main.c

+ 1
- 0
configure.ac Ver arquivo

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


+ 1
- 1
doc/Makefile.am Ver arquivo

@@ -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


doc/toilet.1 → doc/toilet.1.in Ver arquivo

@@ -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,

+ 1
- 0
src/Makefile.am Ver arquivo

@@ -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@


+ 1
- 1
src/main.c Ver arquivo

@@ -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;



Carregando…
Cancelar
Salvar