From cfde054b55bec732c1d410a329edf03248dee46e Mon Sep 17 00:00:00 2001 From: Pietro Cerutti Date: Fri, 30 Mar 2018 13:04:40 +0000 Subject: [PATCH] Fix man substitutions --- doc/Makefile.autosetup | 4 +++- doc/neomutt.man | 10 +++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/doc/Makefile.autosetup b/doc/Makefile.autosetup index 45372f33e..44c887f44 100644 --- a/doc/Makefile.autosetup +++ b/doc/Makefile.autosetup @@ -75,7 +75,9 @@ doc/neomuttrc.5: doc/makedoc$(EXEEXT) \ ) > $@ doc/neomutt.1: - ( sed -e "/^\.TH/s/@MAN_DATE@/$(PACKAGE_DATE)/" \ + ( sed -e "/^\.TH/s|@MAN_DATE@|$(PACKAGE_DATE)|" \ + -e "s|@MAN_SYSCONFDIR@|$(sysconfdir)|g" \ + -e "s|@MAN_DOCDIR@|$(docdir)|g" \ $(SRCDIR)/doc/neomutt.man \ ) > $@ diff --git a/doc/neomutt.man b/doc/neomutt.man index 743a41297..31d2611b1 100644 --- a/doc/neomutt.man +++ b/doc/neomutt.man @@ -72,7 +72,7 @@ OpenPGP, and a threaded sorting mode. .I Note: .IR This manual page gives a brief overview of NeoMutt's command line -options. You should find a copy of the full manual in @docdir@, in +options. You should find a copy of the full manual in @MAN_DOCDIR@, in text, HTML, and/or PDF format. .SH OPTIONS .PP @@ -183,19 +183,19 @@ Specifies the editor to use when composing messages. .PP .IP "~/.neomuttrc or ~/.neomutt/neomuttrc" User configuration file. -.IP "@sysconfdir@/neomuttrc" +.IP "@MAN_SYSCONFDIR@/neomuttrc" System-wide configuration file. .IP "/tmp/neomuttXXXXXX" Temporary files created by NeoMutt. .IP "~/.mailcap" User definition for handling non-text MIME types. -.IP "@sysconfdir@/mailcap" +.IP "@MAN_SYSCONFDIR@/mailcap" System definition for handling non-text MIME types. .IP "~/.mime.types" User's personal mapping between MIME types and file extensions. -.IP "@sysconfdir@/mime.types" +.IP "@MAN_SYSCONFDIR@/mime.types" System mapping between MIME types and file extensions. -.IP "@docdir@/manual.txt" +.IP "@MAN_DOCDIR@/manual.txt" The NeoMutt manual. .SH BUGS .PP -- 2.40.0