Fix man substitutions

diff --git a/doc/Makefile.autosetup b/doc/Makefile.autosetup
index 45372f33e4c37f00ddc07ada3a72ebe7889c54c1..44c887f449f80ffc8beac52f36facea25e6e30dd 100644 (file)
--- 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 743a41297585efb2ed3d81e94943e260ae027d86..31d2611b11075f6c188fa3696b345f24e9bfe385 100644 (file)
--- 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