diff options
| author | Keith Packard <keithp@keithp.com> | 2003-05-31 14:58:41 +0000 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2003-05-31 14:58:41 +0000 |
| commit | 86b1243193a1cbab3286ee97d2543bfc841a575a (patch) | |
| tree | cbc27af4a37123d01fc33be20b6241e5739f3e20 /fc-list | |
| parent | d4d1e8bc604c98d647d70f9188744b95deba8723 (diff) | |
(Bug 87) Automake 1.4 doesn't do man_MAN1 correctly (Bug 88) Fix usage info
on non-long option systems (Tim Mooney)
Diffstat (limited to 'fc-list')
| -rw-r--r-- | fc-list/Makefile.am | 4 | ||||
| -rw-r--r-- | fc-list/fc-list.1 (renamed from fc-list/fc-list.man) | 3 | ||||
| -rw-r--r-- | fc-list/fc-list.c | 11 |
3 files changed, 15 insertions, 3 deletions
diff --git a/fc-list/Makefile.am b/fc-list/Makefile.am index 67874cb4..b050a3fe 100644 --- a/fc-list/Makefile.am +++ b/fc-list/Makefile.am @@ -23,10 +23,10 @@ bin_PROGRAMS=fc-list -man1_MANS=fc-list.man +man_MANS=fc-list.1 INCLUDES=$(FREETYPE_CFLAGS) -EXTRA_DIST=$(man1_MANS) +EXTRA_DIST=$(man_MANS) fc_list_LDADD = ../src/libfontconfig.la diff --git a/fc-list/fc-list.man b/fc-list/fc-list.1 index c1e63360..4efa37ce 100644 --- a/fc-list/fc-list.man +++ b/fc-list/fc-list.1 @@ -27,10 +27,11 @@ fc-list \- list available fonts .SH SYNOPSIS .B "fc-list" -.RI [ font-pattern ] +.RI [-vV?] [--verbose] [--version] [ font-pattern ] { element ... } .SH DESCRIPTION If font pattern is not given, .I fc-list lists all available faces and styles in the current font configuration. +If elements are provided, list only those elements of each matching pattern. .SH "SEE ALSO" fontconfig(3) diff --git a/fc-list/fc-list.c b/fc-list/fc-list.c index 404cd64f..64163311 100644 --- a/fc-list/fc-list.c +++ b/fc-list/fc-list.c @@ -61,13 +61,24 @@ extern int optind, opterr, optopt; static void usage (char *program) { +#if HAVE_GETOPT_LONG fprintf (stderr, "usage: %s [-vV?] [--verbose] [--version] [--help] [pattern] {element ...} \n", program); +#else + fprintf (stderr, "usage: %s [-vV?] [pattern] {element ...} \n", + program); +#endif fprintf (stderr, "List fonts matching [pattern]\n"); fprintf (stderr, "\n"); +#if HAVE_GETOPT_LONG fprintf (stderr, " -v, --verbose display status information while busy\n"); fprintf (stderr, " -V, --version display font config version and exit\n"); fprintf (stderr, " -?, --help display this help and exit\n"); +#else + fprintf (stderr, " -v (verbose) display status information while busy\n"); + fprintf (stderr, " -V (version) display font config version and exit\n"); + fprintf (stderr, " -? (help) display this help and exit\n"); +#endif exit (1); } |