diff options
| author | Adam Jackson <ajax@redhat.com> | 2018-05-07 17:21:20 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2018-05-08 12:15:30 -0400 |
| commit | 0445705a8bbf76a5532997823ea8110daff26c6d (patch) | |
| tree | ff0ff7344b622a82def11230de1963fecacdb84b | |
| parent | 9f21872ad8591c1f6f8ea1e466f212c3582d3c33 (diff) | |
man: Fix automake seddery
Because this is an automakefile, things inside @@ get expanded, which
means your sed ends up saying s|/var/log|/var/log| and your manual pages
still have @logdir@ in them. Fix this by hiding the @s inside a trivial
character range, which keeps the pattern preserved all the way into the
Makefile.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
| -rw-r--r-- | manpages.am | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/manpages.am b/manpages.am index 8a36b0c1c..15056905c 100644 --- a/manpages.am +++ b/manpages.am @@ -34,21 +34,21 @@ MAN_SUBSTS += -e 's|@vendorversion@|"$(PACKAGE_STRING)" "$(XORG_MAN_PAGE)"|' \ # 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): |