Changeset 1326 for toilet


Ignore:
Timestamp:
Nov 10, 2006, 3:30:22 PM (13 years ago)
Author:
Sam Hocevar
Message:
  • Allow setting the font directory using --datadir / --datarootdir.
Location:
toilet/trunk
Files:
4 edited
1 moved

Legend:

Unmodified
Added
Removed
  • toilet/trunk/configure.ac

    r1325 r1326  
    7878  fonts/Makefile
    7979  doc/Makefile
     80  doc/toilet.1
    8081])
    8182
  • toilet/trunk/doc/Makefile.am

    r1323 r1326  
    11# $Id: Makefile.am 871 2006-09-25 15:58:33Z sam $
    22
    3 EXTRA_DIST = $(man_MANS)
     3EXTRA_DIST = toilet.1.in
    44
    55man_MANS = toilet.1
  • toilet/trunk/doc/toilet.1.in

    r1324 r1326  
    5656.B .tlf
    5757files stored in the
    58 .B /usr/share/figlet
     58.B @datarootdir@/figlet
    5959directory. There is also a special built-in font called
    6060.I term
     
    6464Specify the directory in which to look for fonts. The default value is set
    6565at build time and usually defaults to
    66 .B /usr/share/figlet.
     66.B @datarootdir@/figlet.
    6767.TP
    6868.B \-w, \-\-width <width>
  • toilet/trunk/src/Makefile.am

    r1321 r1326  
    88        export.c export.h \
    99        term.c figlet.c
     10toilet_CPPFLAGS = -DFONTDIR=\"$(datadir)/figlet\"
    1011toilet_CFLAGS = `pkg-config --cflags cucul`
    1112toilet_LDFLAGS = `pkg-config --libs cucul` @GETOPT_LIBS@ @ZLIB_LIBS@
  • toilet/trunk/src/main.c

    r1321 r1326  
    5151    cx->export = "utf8";
    5252    cx->font = "smblock";
    53     cx->dir = "/usr/share/figlet/";
     53    cx->dir = FONTDIR;
    5454
    5555    cx->term_width = 80;
Note: See TracChangeset for help on using the changeset viewer.