From 184f5f3948b98abd21082e0cdc302502d70c3c49 Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Wed, 19 Jan 2011 10:06:56 -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 | 43 ++++----------------------- configure.ac | 5 +++- man/Makefile.am | 12 ++++++++ man/xlsfonts.man | 88 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ xlsfonts.man | 88 -------------------------------------------------------- 5 files changed, 109 insertions(+), 127 deletions(-) create mode 100644 man/Makefile.am create mode 100644 man/xlsfonts.man delete mode 100644 xlsfonts.man diff --git a/Makefile.am b/Makefile.am index bb83e7d..9cd8d5f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,20 +19,19 @@ # TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. +SUBDIRS = man bin_PROGRAMS = xlsfonts AM_CFLAGS = $(XLSFONTS_CFLAGS) $(CWARNFLAGS) xlsfonts_LDADD = $(XLSFONTS_LIBS) xlsfonts_SOURCES = \ - dsimple.c \ - dsimple.h \ + dsimple.c \ + dsimple.h \ xlsfonts.c -appman_PRE = \ - xlsfonts.man - -EXTRA_DIST = xlsfonts.xml autogen.sh +EXTRA_DIST = xlsfonts.xml +MAINTAINERCLEANFILES = ChangeLog INSTALL .PHONY: ChangeLog INSTALL @@ -43,35 +42,3 @@ ChangeLog: $(CHANGELOG_CMD) dist-hook: ChangeLog INSTALL - -appmandir = $(APP_MAN_DIR) - -appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@) - -EXTRA_DIST += $(appman_PRE) -MAINTAINERCLEANFILES = ChangeLog INSTALL -CLEANFILES = $(appman_DATA) - -SED = sed - -# Strings to replace in man pages -XORGRELSTRING = @PACKAGE_STRING@ - XORGMANNAME = X Version 11 - -MAN_SUBSTS = \ - -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ - -e 's|__xservername__|Xorg|g' \ - -e 's|__xconfigfile__|xorg.conf|g' \ - -e 's|__projectroot__|$(prefix)|g' \ - -e 's|__apploaddir__|$(appdefaultdir)|' \ - -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ - -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \ - -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ - -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ - -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' - -SUFFIXES = .$(APP_MAN_SUFFIX) .man - -.man.$(APP_MAN_SUFFIX): - sed $(MAN_SUBSTS) < $< > $@ diff --git a/configure.ac b/configure.ac index afbc144..5c6b2e6 100644 --- a/configure.ac +++ b/configure.ac @@ -40,4 +40,7 @@ AC_CONFIG_HEADERS([config.h]) PKG_CHECK_MODULES(XLSFONTS, x11) -AC_OUTPUT([Makefile]) +AC_CONFIG_FILES([ + Makefile + man/Makefile]) +AC_OUTPUT diff --git a/man/Makefile.am b/man/Makefile.am new file mode 100644 index 0000000..359ff92 --- /dev/null +++ b/man/Makefile.am @@ -0,0 +1,12 @@ + +appmandir = $(APP_MAN_DIR) +appman_PRE = xlsfonts.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/xlsfonts.man b/man/xlsfonts.man new file mode 100644 index 0000000..620464e --- /dev/null +++ b/man/xlsfonts.man @@ -0,0 +1,88 @@ +.\" -*- coding: us-ascii -*- +.TH xlsfonts __appmansuffix__ __xorgversion__ +.SH NAME +xlsfonts \- server font list displayer for X +.SH SYNOPSIS +.ad l +\fBxlsfonts\fR +[\fB\-display \fBhost:dpy\fR\fR] [\fB\-l\fR] [\fB\-ll\fR] [\fB\-lll\fR] [\fB\-m\fR] [\fB\-C\fR] [\fB\-1\fR] [\fB\-w \fBwidth\fR\fR] [\fB\-n \fBcolumns\fR\fR] [\fB\-u\fR] [\fB\-o\fR] [\fB\-fn \fBpattern\fR\fR] +.SH DESCRIPTION +xlsfonts lists the fonts that match the given pattern. +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 +.TP +\fB\-display \fIhost:dpy\fB\fR +This option specifies the X server to contact. +.TP +\fB\-d \fIhost:dpy\fB\fR +Same as \fB\-display \fIhost:dpy\fB\fR. +.TP +\fB\-l\fR +Lists some attributes of the font on one line in addition +to its name. +.TP +\fB\-ll\fR +Lists font properties in addition to \fB\-l\fR output. +.TP +\fB\-lll\fR +Lists character metrics in addition to \fB\-ll\fR output. +.TP +\fB\-m\fR +This option indicates that long listings should also print +the minimum and maximum bounds of each font. +.TP +\fB\-C\fR +This option indicates that listings should use multiple columns. +This is the same as \fB\-n 0\fR. +.TP +\fB\-1\fR +This option indicates that listings should use a single column. +This is the same as \fB\-n 1\fR. +.TP +\fB\-w \fIwidth\fB\fR +This option specifies the width in characters that should be +used in figuring out how many columns to print. +The default is 79. +.TP +\fB\-n \fIcolumns\fB\fR +This option specifies the number of columns to use in +displaying the output. By default, it will attempt to +fit as many columns of font names into the number of +character specified by \fB\-w\fR width. +.TP +\fB\-u\fR +This option indicates that the output should be left unsorted. +.TP +\fB\-o\fR +This option indicates that xlsfonts should do an OpenFont +(and QueryFont, if appropriate) rather than a ListFonts. +This is useful if ListFonts or ListFontsWithInfo fail to +list a known font (as is the case with some scaled font +systems). +.TP +\fB\-fn \fIpattern\fB\fR +This option specifies the font name pattern to match. +.SH "SEE ALSO" +\fBX\fR(__miscmansuffix__), \fBXserver\fR(__appmansuffix__), \fBxset\fR(__appmansuffix__), \fBxfd\fR(__appmansuffix__), X Logical Font Description Conventions +.SH ENVIRONMENT +.TP +\fBDISPLAY\fR +\fBDISPLAY\fR must be set to get the default host and display to use. +.SH BUGS +Doing ``xlsfonts -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 + +Mark Lillibridge +.PP +Jim Fulton +.PP +Phil Karlton +.PP +Roland Mainz + diff --git a/xlsfonts.man b/xlsfonts.man deleted file mode 100644 index 620464e..0000000 --- a/xlsfonts.man +++ /dev/null @@ -1,88 +0,0 @@ -.\" -*- coding: us-ascii -*- -.TH xlsfonts __appmansuffix__ __xorgversion__ -.SH NAME -xlsfonts \- server font list displayer for X -.SH SYNOPSIS -.ad l -\fBxlsfonts\fR -[\fB\-display \fBhost:dpy\fR\fR] [\fB\-l\fR] [\fB\-ll\fR] [\fB\-lll\fR] [\fB\-m\fR] [\fB\-C\fR] [\fB\-1\fR] [\fB\-w \fBwidth\fR\fR] [\fB\-n \fBcolumns\fR\fR] [\fB\-u\fR] [\fB\-o\fR] [\fB\-fn \fBpattern\fR\fR] -.SH DESCRIPTION -xlsfonts lists the fonts that match the given pattern. -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 -.TP -\fB\-display \fIhost:dpy\fB\fR -This option specifies the X server to contact. -.TP -\fB\-d \fIhost:dpy\fB\fR -Same as \fB\-display \fIhost:dpy\fB\fR. -.TP -\fB\-l\fR -Lists some attributes of the font on one line in addition -to its name. -.TP -\fB\-ll\fR -Lists font properties in addition to \fB\-l\fR output. -.TP -\fB\-lll\fR -Lists character metrics in addition to \fB\-ll\fR output. -.TP -\fB\-m\fR -This option indicates that long listings should also print -the minimum and maximum bounds of each font. -.TP -\fB\-C\fR -This option indicates that listings should use multiple columns. -This is the same as \fB\-n 0\fR. -.TP -\fB\-1\fR -This option indicates that listings should use a single column. -This is the same as \fB\-n 1\fR. -.TP -\fB\-w \fIwidth\fB\fR -This option specifies the width in characters that should be -used in figuring out how many columns to print. -The default is 79. -.TP -\fB\-n \fIcolumns\fB\fR -This option specifies the number of columns to use in -displaying the output. By default, it will attempt to -fit as many columns of font names into the number of -character specified by \fB\-w\fR width. -.TP -\fB\-u\fR -This option indicates that the output should be left unsorted. -.TP -\fB\-o\fR -This option indicates that xlsfonts should do an OpenFont -(and QueryFont, if appropriate) rather than a ListFonts. -This is useful if ListFonts or ListFontsWithInfo fail to -list a known font (as is the case with some scaled font -systems). -.TP -\fB\-fn \fIpattern\fB\fR -This option specifies the font name pattern to match. -.SH "SEE ALSO" -\fBX\fR(__miscmansuffix__), \fBXserver\fR(__appmansuffix__), \fBxset\fR(__appmansuffix__), \fBxfd\fR(__appmansuffix__), X Logical Font Description Conventions -.SH ENVIRONMENT -.TP -\fBDISPLAY\fR -\fBDISPLAY\fR must be set to get the default host and display to use. -.SH BUGS -Doing ``xlsfonts -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 - -Mark Lillibridge -.PP -Jim Fulton -.PP -Phil Karlton -.PP -Roland Mainz - -- cgit v1.2.3