diff options
| author | Adam Jackson <ajax@redhat.com> | 2018-03-26 18:42:52 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2018-03-27 10:13:17 -0400 |
| commit | 2e497bf887aca832dc0dd30d071c5288ab5c1e15 (patch) | |
| tree | ae0b7405f8a7388383cf33d9abeefbc7452d1e95 /manpages.am | |
| parent | 6cbefc3e0a33b380c147c533914437c7798d9b93 (diff) | |
man: s/__/@/g
A cosmetic change for automake (though we have to replicate some of
xorg-macros.m4 in manpages.am now), but meson's configure_file() wants
@-delimited strings.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'manpages.am')
| -rw-r--r-- | manpages.am | 46 |
1 files changed, 31 insertions, 15 deletions
diff --git a/manpages.am b/manpages.am index 124bb5575..3ef3f08a6 100644 --- a/manpages.am +++ b/manpages.am @@ -16,23 +16,39 @@ EXTRA_DIST = $(appman_PRE) $(driverman_PRE) $(fileman_PRE) CLEANFILES = $(appman_DATA) $(driverman_DATA) $(fileman_DATA) SUFFIXES = .$(APP_MAN_SUFFIX) .$(DRIVER_MAN_SUFFIX) .$(FILE_MAN_SUFFIX) .man +# xorg-macros.m4 has these bracketed by double underscores, but meson +# wants ats. + +MAN_SUBSTS += -e 's|@vendorversion@|\"\$(PACKAGE_STRING)\" \"\$(XORG_MAN_PAGE)\"|' \ + -e 's|@xorgversion@|\"\$(PACKAGE_STRING)\" \"\$(XORG_MAN_PAGE)\"|' \ + -e 's|@xservername@|Xorg|g' \ + -e 's|@xconfigfile@|xorg.conf|g' \ + -e 's|@projectroot@|\$(prefix)|g' \ + -e 's|@apploaddir@|\$(appdefaultdir)|g' \ + -e 's|@appmansuffix@|\$(APP_MAN_SUFFIX)|g' \ + -e 's|@drivermansuffix@|\$(DRIVER_MAN_SUFFIX)|g' \ + -e 's|@adminmansuffix@|\$(ADMIN_MAN_SUFFIX)|g' \ + -e 's|@libmansuffix@|\$(LIB_MAN_SUFFIX)|g' \ + -e 's|@miscmansuffix@|\$(MISC_MAN_SUFFIX)|g' \ + -e 's|@filemansuffix@|\$(FILE_MAN_SUFFIX)|g' + # Add server specific man pages string substitution from XORG_MANPAGE_SECTIONS # 's|/,|/, |g' will add a space to help font path formatting -MAN_SUBSTS += -e 's|__logdir__|$(logdir)|g' \ - -e 's|__datadir__|$(datadir)|g' \ - -e 's|__mandir__|$(mandir)|g' \ - -e 's|__sysconfdir__|$(sysconfdir)|g' \ - -e 's|__xconfigdir__|$(XCONFIGDIR)|g' \ - -e 's|__xkbdir__|$(XKB_BASE_DIRECTORY)|g' \ - -e 's|__XKB_DFLT_RULES__|$(XKB_DFLT_RULES)|g' \ - -e 's|__XKB_DFLT_MODEL__|$(XKB_DFLT_MODEL)|g' \ - -e 's|__XKB_DFLT_LAYOUT__|$(XKB_DFLT_LAYOUT)|g' \ - -e 's|__XKB_DFLT_VARIANT__|$(XKB_DFLT_VARIANT)|g' \ - -e 's|__XKB_DFLT_OPTIONS__|$(XKB_DFLT_OPTIONS)|g' \ - -e 's|__bundle_id_prefix__|$(BUNDLE_ID_PREFIX)|g' \ - -e 's|__modulepath__|$(DEFAULT_MODULE_PATH)|g' \ - -e 's|__suid_wrapper_dir__|$(SUID_WRAPPER_DIR)|g' \ - -e 's|__default_font_path__|$(COMPILEDDEFAULTFONTPATH)|g' \ +MAN_SUBSTS += -e 's|@logdir@|$(logdir)|g' \ + -e 's|@datadir@|$(datadir)|g' \ + -e 's|@mandir@|$(mandir)|g' \ + -e 's|@sysconfdir@|$(sysconfdir)|g' \ + -e 's|@xconfigdir@|$(XCONFIGDIR)|g' \ + -e 's|@xkbdir@|$(XKB_BASE_DIRECTORY)|g' \ + -e 's|@XKB_DFLT_RULES@|$(XKB_DFLT_RULES)|g' \ + -e 's|@XKB_DFLT_MODEL@|$(XKB_DFLT_MODEL)|g' \ + -e 's|@XKB_DFLT_LAYOUT@|$(XKB_DFLT_LAYOUT)|g' \ + -e 's|@XKB_DFLT_VARIANT@|$(XKB_DFLT_VARIANT)|g' \ + -e 's|@XKB_DFLT_OPTIONS@|$(XKB_DFLT_OPTIONS)|g' \ + -e 's|@bundle_id_prefix@|$(BUNDLE_ID_PREFIX)|g' \ + -e 's|@modulepath@|$(DEFAULT_MODULE_PATH)|g' \ + -e 's|@suid_wrapper_dir@|$(SUID_WRAPPER_DIR)|g' \ + -e 's|@default_font_path@|$(COMPILEDDEFAULTFONTPATH)|g' \ -e '\|$(COMPILEDDEFAULTFONTPATH)| s|/,|/, |g' .man.$(APP_MAN_SUFFIX): |