diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2024-04-07 12:53:58 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2024-04-07 12:53:58 -0700 |
| commit | 2b5316265c5ce6c7dbd8f726826d5d5a7385febd (patch) | |
| tree | d0603d97524973dfd95c5c70fcce0d309cb31206 | |
| parent | 888aece87c0af4e0b326d4d92fcc079f249a7f73 (diff) | |
configure: use @-style substitutions for man pages instead of __-style
Moves substitution of variables from Makefile.am to configure.ac
in preparation for allowing meson.build to do the same.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/app/appres/-/merge_requests/4>
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | man/Makefile.am | 5 | ||||
| -rw-r--r-- | man/appres.man | 4 |
3 files changed, 5 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 32c22d3..6de0b23 100644 --- a/configure.ac +++ b/configure.ac @@ -40,6 +40,9 @@ XORG_DEFAULT_OPTIONS # Checks for pkg-config packages PKG_CHECK_MODULES(APPRES, [x11 xt xproto >= 7.0.17]) +# Substitute config variables in man pages +AC_CONFIG_FILES([man/appres.1:man/appres.man]) + AC_CONFIG_FILES([ Makefile man/Makefile]) diff --git a/man/Makefile.am b/man/Makefile.am index 76a8224..0c8ce75 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -5,8 +5,3 @@ 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/appres.man b/man/appres.man index 10ec801..8e78a9d 100644 --- a/man/appres.man +++ b/man/appres.man @@ -22,7 +22,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.TH APPRES 1 __xorgversion__ +.TH APPRES 1 "@PACKAGE_STRING@" "@XORG_MAN_PAGE@" .SH NAME appres \- list X application resource database .SH SYNOPSIS @@ -86,6 +86,6 @@ will list the resources matching the \fIxterm\fP vt100 widget. The -V option prints the appres command version and exits. .SH "SEE ALSO" .PP -X(__miscmansuffix__), xrdb(__appmansuffix__), listres(__appmansuffix__) +X(@MISC_MAN_SUFFIX@), xrdb(@APP_MAN_SUFFIX@), listres(@APP_MAN_SUFFIX@) .SH AUTHOR Jim Fulton, MIT X Consortium |