diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2025-02-08 12:53:52 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2025-02-08 12:53:52 -0800 |
| commit | 950902a7a80f3922bb82422e320231ee00328998 (patch) | |
| tree | 4ab650c2b2521ee077f545522a32f9f81bea1899 | |
| parent | 0ee2c68b5d3ea3eb36f895d9dfcc4ebe1416f176 (diff) | |
configure: generate man pages with AC_CONFIG_FILES instead of sed
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/util/bdftopcf/-/merge_requests/9>
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | man/Makefile.am | 12 | ||||
| -rw-r--r-- | man/bdftopcf.1.in (renamed from man/bdftopcf.man) | 4 |
4 files changed, 6 insertions, 16 deletions
diff --git a/Makefile.am b/Makefile.am index 18d48f8..33fa38a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,7 +19,6 @@ # OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # PERFORMANCE OF THIS SOFTWARE. -SUBDIRS = man bin_PROGRAMS = bdftopcf AM_CFLAGS = $(BDFTOPCF_CFLAGS) $(CWARNFLAGS) @@ -54,6 +53,9 @@ bdftopcf_SOURCES = \ utilbitmap.c \ bdftopcf.c +appmandir = $(APP_MAN_DIR) +appman_DATA = man/bdftopcf.1 + MAINTAINERCLEANFILES = ChangeLog INSTALL .PHONY: ChangeLog INSTALL diff --git a/configure.ac b/configure.ac index 02bf960..2cf6138 100644 --- a/configure.ac +++ b/configure.ac @@ -42,5 +42,5 @@ PKG_CHECK_MODULES(BDFTOPCF, [xproto >= 7.0.22 fontsproto >= 2.1.3]) AC_CONFIG_FILES([ Makefile - man/Makefile]) + man/bdftopcf.1]) AC_OUTPUT diff --git a/man/Makefile.am b/man/Makefile.am deleted file mode 100644 index e90b491..0000000 --- a/man/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ - -appmandir = $(APP_MAN_DIR) -appman_PRE = bdftopcf.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/bdftopcf.man b/man/bdftopcf.1.in index c8c8f7a..2dc48ac 100644 --- a/man/bdftopcf.man +++ b/man/bdftopcf.1.in @@ -22,7 +22,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.TH BDFTOPCF 1 __xorgversion__ +.TH BDFTOPCF 1 "@PACKAGE_STRING@" "X Version 11" .SH NAME bdftopcf \- convert X font from Bitmap Distribution Format to Portable Compiled Format @@ -110,6 +110,6 @@ to be used instead. .B \-v Print version information and exit. .SH "SEE ALSO" -X(__miscmansuffix__) +X(7) .SH AUTHOR Keith Packard, MIT X Consortium |