Changeset 1326Tweet

Timestamp:

Nov 10, 2006, 3:30:22 PM (16 years ago)

Author:

Sam Hocevar

Message:

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

Location:

toilet/trunk

Files:

• configure.ac (modified) (1 diff)
• doc/Makefile.am (modified) (1 diff)
• doc/toilet.1.in (moved) (moved from toilet/trunk/doc/toilet.1) (2 diffs)
• src/Makefile.am (modified) (1 diff)
• src/main.c (modified) (1 diff)

toilet/trunk/configure.ac

@@ -78 +78 @@
   fonts/Makefile
   doc/Makefile
+  doc/toilet.1
 ])
 

toilet/trunk/doc/Makefile.am

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

toilet/trunk/doc/toilet.1.in

@@ -56 +56 @@
 .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
@@ -64 +64 @@
 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>

toilet/trunk/src/Makefile.am

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

toilet/trunk/src/main.c

@@ -51 +51 @@
     cx->export = "utf8";
     cx->font = "smblock";
-    cx->dir = "/usr/share/figlet/";
+    cx->dir = FONTDIR;
 
     cx->term_width = 80;