Fully expand $docdir when building Muttrc (closes: #2832)

diff --git a/Makefile.am b/Makefile.am
index d299d028f092fdc8e26dfe46a05013a643bd4b11..d171977b3dc521f8e52275d9343f4cd5c5b129ca 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -201,8 +201,9 @@ Muttrc: stamp-doc-rc
 
 stamp-doc-rc: $(srcdir)/init.h makedoc Muttrc.head
        -rm -f Muttrc stamp-doc-rc
+       sed -e 's,[@]docdir[@],$(docdir),' $(srcdir)/Muttrc.head > Muttrc
        $(CPP) $(AM_CPPFLAGS) $(DEFS) $(CPPFLAGS) -D_MAKEDOC -C \
-               $(srcdir)/init.h | ./makedoc -c | cat Muttrc.head - > Muttrc
+               $(srcdir)/init.h | ./makedoc -c >> Muttrc
        touch stamp-doc-rc
 
 

diff --git a/Muttrc.head.in b/Muttrc.head
similarity index 100%
rename from Muttrc.head.in
rename to Muttrc.head

diff --git a/configure.in b/configure.in
index f3b0d4003ca5a5cecb02677f3a93f874a7d0b43e..2cd6b00ec2f5b196a07e63d92a6752192873d5b6 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1166,5 +1166,4 @@ AC_OUTPUT(Makefile intl/Makefile m4/Makefile
         po/Makefile.in doc/Makefile contrib/Makefile
         muttbug.sh
         imap/Makefile
-        Muttrc.head
         doc/instdoc.sh)