From 8bafda7027f51313cfd8e5f4447812064c1686bb Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Wed, 19 Jan 2011 10:06:55 -0500 Subject: config: move man pages into their own directory Use services provided by XORG_MANPAGE_SECTIONS. Use standard Makefile for man pages. Signed-off-by: Gaetan Nadon --- Makefile.am | 11 +----- configure.ac | 5 ++- fslsfonts.man | 104 ------------------------------------------------------ man/Makefile.am | 12 +++++++ man/fslsfonts.man | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 121 insertions(+), 115 deletions(-) delete mode 100644 fslsfonts.man create mode 100644 man/Makefile.am create mode 100644 man/fslsfonts.man diff --git a/Makefile.am b/Makefile.am index 60f3203..1341f5a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,6 +19,7 @@ # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. +SUBDIRS = man bin_PROGRAMS = fslsfonts AM_CFLAGS = $(FSLSFONTS_CFLAGS) $(CWARNFLAGS) @@ -27,23 +28,13 @@ fslsfonts_LDADD = $(FSLSFONTS_LIBS) fslsfonts_SOURCES = \ fslsfonts.c -appman_PRE = \ - fslsfonts.man -appmandir = $(APP_MAN_DIR) -appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) -EXTRA_DIST = $(appman_PRE) MAINTAINERCLEANFILES = ChangeLog INSTALL -CLEANFILES = $(appman_DATA) -SUFFIXES = .$(APP_MAN_SUFFIX) .man -# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure -.man.$(APP_MAN_SUFFIX): - $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ .PHONY: ChangeLog INSTALL diff --git a/configure.ac b/configure.ac index f247a58..63e0665 100644 --- a/configure.ac +++ b/configure.ac @@ -38,4 +38,7 @@ AC_CONFIG_HEADERS([config.h]) # Checks for pkg-config packages PKG_CHECK_MODULES(FSLSFONTS, xproto libfs) -AC_OUTPUT([Makefile]) +AC_CONFIG_FILES([ + Makefile + man/Makefile]) +AC_OUTPUT diff --git a/fslsfonts.man b/fslsfonts.man deleted file mode 100644 index 35dd1c3..0000000 --- a/fslsfonts.man +++ /dev/null @@ -1,104 +0,0 @@ -.\" Copyright 1991, Network Computing Devices, Inc -.\" Copyright 1993, 1994, 1998 The Open Group -.\" -.\" Permission to use, copy, modify, distribute, and sell this software and its -.\" documentation for any purpose is hereby granted without fee, provided that -.\" the above copyright notice appear in all copies and that both that -.\" copyright notice and this permission notice appear in supporting -.\" documentation. -.\" -.\" The above copyright notice and this permission notice shall be included -.\" in all copies or substantial portions of the Software. -.\" -.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -.\" IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR -.\" OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -.\" ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -.\" OTHER DEALINGS IN THE SOFTWARE. -.\" -.\" Except as contained in this notice, the name of The Open Group shall -.\" not be used in advertising or otherwise to promote the sale, use or -.\" other dealings in this Software without prior written authorization -.\" from The Open Group. -.\" -.TH FSLSFONTS 1 __xorgversion__ -.SH NAME -fslsfonts \- list fonts served by X font server -.SH SYNOPSIS -.B fslsfonts -[\-options ...] [\-fn pattern] -.SH DESCRIPTION -.I fslsfonts -lists the fonts that match the given \fIpattern\fP. -The wildcard character "*" may be used to match any sequence of -characters (including none), and "?" to match any single character. -If no pattern is given, "*" is assumed. -.PP -The "*" and "?" characters must be quoted to prevent them from -being expanded by the shell. -.SH "OPTIONS" -.PP -.TP 8 -.B \-server \fIservername\fP -This option specifies the X font server to contact. -.I servername -must be specified in one of the formats defined in the -.I Font Server Names -section of X(__miscmansuffix__). If not specified, the server name in the -.B FONTSERVER -environment variable is used. -.PP -.TP 8 -.B \-l -Lists some attributes of the font on one line in addition to its name. -.TP 8 -.B \-ll -Lists font properties in addition to \fB\-l\fP output. -.TP 8 -.B \-lll -Supported for compatibility with \fIxlsfonts\fP, but output is the -same as for \fB\-ll\fP. -.TP 8 -.B \-m -This option indicates that long listings should also print the minimum and -maximum bounds of each font. -.TP 8 -.B \-C -This option indicates that listings should use multiple columns. This is the -same as \fB\-n 0\fP. -.TP 8 -.B \-1 -This option indicates that listings should use a single column. This is the -same as \fB\-n 1\fP. -.TP 8 -.B \-w \fIwidth\fP -This option specifies the width in characters that should be used in -figuring out how many columns to print. The default is 79. -.TP 8 -.B \-n \fIcolumns\fP -This option specifies the number of columns to use in displaying the output. -The default is 0, which -will attempt to fit as many columns of font names into the -number of character specified by \fB\-w\fP \fIwidth\fP. -.TP 8 -.B \-u -This option indicates that the output should be left unsorted. -.PP -.SH ENVIRONMENT -.TP 8 -.B FONTSERVER -To get the default fontserver. The server name must -be specified in one of the formats defined in the -.I Font Server Names -section of X(__miscmansuffix__). -.SH "SEE ALSO" -xfs(__appmansuffix__), showfont(__appmansuffix__), xlsfonts(__appmansuffix__), -X(__miscmansuffix__). -.SH BUGS -Doing ``fslsfonts \-l'' can tie up your server for a very long time. -This is really a bug with single-threaded non-preemptable servers, not with -this program. -.SH AUTHOR -Dave Lemke, Network Computing Devices, Inc diff --git a/man/Makefile.am b/man/Makefile.am new file mode 100644 index 0000000..e9caaac --- /dev/null +++ b/man/Makefile.am @@ -0,0 +1,12 @@ + +appmandir = $(APP_MAN_DIR) +appman_PRE = fslsfonts.man +appman_DATA = $(appman_PRE:man=$(APP_MAN_SUFFIX)) + +EXTRA_DIST = $(appman_PRE) +CLEANFILES = $(appman_DATA) +SUFFIXES = .$(APP_MAN_SUFFIX) .man + +# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure +.man.$(APP_MAN_SUFFIX): + $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ diff --git a/man/fslsfonts.man b/man/fslsfonts.man new file mode 100644 index 0000000..35dd1c3 --- /dev/null +++ b/man/fslsfonts.man @@ -0,0 +1,104 @@ +.\" Copyright 1991, Network Computing Devices, Inc +.\" Copyright 1993, 1994, 1998 The Open Group +.\" +.\" Permission to use, copy, modify, distribute, and sell this software and its +.\" documentation for any purpose is hereby granted without fee, provided that +.\" the above copyright notice appear in all copies and that both that +.\" copyright notice and this permission notice appear in supporting +.\" documentation. +.\" +.\" The above copyright notice and this permission notice shall be included +.\" in all copies or substantial portions of the Software. +.\" +.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +.\" IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR +.\" OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +.\" ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +.\" OTHER DEALINGS IN THE SOFTWARE. +.\" +.\" Except as contained in this notice, the name of The Open Group shall +.\" not be used in advertising or otherwise to promote the sale, use or +.\" other dealings in this Software without prior written authorization +.\" from The Open Group. +.\" +.TH FSLSFONTS 1 __xorgversion__ +.SH NAME +fslsfonts \- list fonts served by X font server +.SH SYNOPSIS +.B fslsfonts +[\-options ...] [\-fn pattern] +.SH DESCRIPTION +.I fslsfonts +lists the fonts that match the given \fIpattern\fP. +The wildcard character "*" may be used to match any sequence of +characters (including none), and "?" to match any single character. +If no pattern is given, "*" is assumed. +.PP +The "*" and "?" characters must be quoted to prevent them from +being expanded by the shell. +.SH "OPTIONS" +.PP +.TP 8 +.B \-server \fIservername\fP +This option specifies the X font server to contact. +.I servername +must be specified in one of the formats defined in the +.I Font Server Names +section of X(__miscmansuffix__). If not specified, the server name in the +.B FONTSERVER +environment variable is used. +.PP +.TP 8 +.B \-l +Lists some attributes of the font on one line in addition to its name. +.TP 8 +.B \-ll +Lists font properties in addition to \fB\-l\fP output. +.TP 8 +.B \-lll +Supported for compatibility with \fIxlsfonts\fP, but output is the +same as for \fB\-ll\fP. +.TP 8 +.B \-m +This option indicates that long listings should also print the minimum and +maximum bounds of each font. +.TP 8 +.B \-C +This option indicates that listings should use multiple columns. This is the +same as \fB\-n 0\fP. +.TP 8 +.B \-1 +This option indicates that listings should use a single column. This is the +same as \fB\-n 1\fP. +.TP 8 +.B \-w \fIwidth\fP +This option specifies the width in characters that should be used in +figuring out how many columns to print. The default is 79. +.TP 8 +.B \-n \fIcolumns\fP +This option specifies the number of columns to use in displaying the output. +The default is 0, which +will attempt to fit as many columns of font names into the +number of character specified by \fB\-w\fP \fIwidth\fP. +.TP 8 +.B \-u +This option indicates that the output should be left unsorted. +.PP +.SH ENVIRONMENT +.TP 8 +.B FONTSERVER +To get the default fontserver. The server name must +be specified in one of the formats defined in the +.I Font Server Names +section of X(__miscmansuffix__). +.SH "SEE ALSO" +xfs(__appmansuffix__), showfont(__appmansuffix__), xlsfonts(__appmansuffix__), +X(__miscmansuffix__). +.SH BUGS +Doing ``fslsfonts \-l'' can tie up your server for a very long time. +This is really a bug with single-threaded non-preemptable servers, not with +this program. +.SH AUTHOR +Dave Lemke, Network Computing Devices, Inc -- cgit v1.2.3