summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrendan Cully <brendan@kublai.com>2007-03-13 22:40:07 -0700
committerBrendan Cully <brendan@kublai.com>2007-03-13 22:40:07 -0700
commit11473122b74f27b2af6364d2cdac1bf7a4c13280 (patch)
tree84e0d0ebb6559fdb6d79f26e588b3d369d07225f
parent9efe5b134f9577d42fc4e328906629f8b4575d9d (diff)
Fully expand $docdir when building Muttrc (closes: #2832)
-rw-r--r--Makefile.am3
-rw-r--r--Muttrc.head (renamed from Muttrc.head.in)0
-rw-r--r--configure.in1
3 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index d299d028..d171977b 100644
--- 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
index a01449bc..a01449bc 100644
--- a/Muttrc.head.in
+++ b/Muttrc.head
diff --git a/configure.in b/configure.in
index f3b0d400..2cd6b00e 100644
--- 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)