iconv-hook.

5 files changed, 60 insertions, 9 deletions

diff --git a/doc/Makefile.in b/doc/Makefile.in
index cec97cc7..1f0132f8 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -68,16 +68,16 @@ try-html: ../makedoc
 try-txt: ../makedoc
 	test -f manual.txt || $(MAKE) manual.txt || cp $(srcdir)/manual.txt ./
 
-install: all
+install: all instdoc
 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man5
-	$(INSTALL) -m 644 $(srcdir)/mutt.man $(DESTDIR)$(mandir)/man1/mutt.1
-	$(INSTALL) -m 644 $(srcdir)/muttbug.man	$(DESTDIR)$(mandir)/man1/flea.1
+	./instdoc $(srcdir)/mutt.man $(DESTDIR)$(mandir)/man1/mutt.1
+	./instdoc $(srcdir)/muttbug.man $(DESTDIR)$(mandir)/man1/flea.1
 	echo ".so $(mandir)/man1/flea.1" > $(DESTDIR)$(mandir)/man1/muttbug.1
-	$(INSTALL) -m 644 $(srcdir)/dotlock.man \
+	./instdoc $(srcdir)/dotlock.man \
 		$(DESTDIR)$(mandir)/man1/mutt_dotlock.1
-	$(INSTALL) -m 644 muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5
-	$(INSTALL) -m 644 $(srcdir)/mbox.man $(DESTDIR)$(mandir)/man5/mbox.5
+	./instdoc muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5
+	./instdoc $(srcdir)/mbox.man $(DESTDIR)$(mandir)/man5/mbox.5
 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)
 	for f in $(srcdir_DOCFILES) ; do \
 		$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \
@@ -126,6 +126,10 @@ Makefile: Makefile.in ../config.status
 	cd .. \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
+instdoc.sh: instdoc.sh.in ../config.status
+	cd .. \
+	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
 distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
 dist distdir: Makefile $(DISTFILES)
 	for file in $(DISTFILES) ; do				\
diff --git a/doc/instdoc.sh.in b/doc/instdoc.sh.in
new file mode 100644
index 00000000..953d9202
--- /dev/null
+++ b/doc/instdoc.sh.in
@@ -0,0 +1,25 @@
+#!/bin/sh --
+
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+bindir=@bindir@
+libdir=@libdir@
+mandir=@mandir@
+sharedir=@sharedir@
+srcdir=@srcdir@
+docdir=@docdir@
+includedir=@includedir@
+top_srcdir=@top_srcdir@
+top_builddir=..
+
+SOURCE="$1"
+TARGET="$2"
+
+
+rm -f "$TARGET"
+
+sed -e "s;/usr/local/bin/;$bindir/;g" 	 	\
+    -e "s;/usr/local/doc/mutt/;$docdir/;g" 	\
+    "$SOURCE" > $TARGET
+
+chmod 644 "$TARGET"
diff --git a/doc/manual.sgml.head b/doc/manual.sgml.head
index 635f16a4..bda78451 100644
--- a/doc/manual.sgml.head
+++ b/doc/manual.sgml.head
@@ -918,10 +918,17 @@ sequence.
 <sect1>Defining aliases for character sets <label id="charset-hook">
 <p>
 Usage: <tt/charset-hook/ <em/alias/ <em/charset/
+Usage: <tt/iconv-hook/ <em/charset/ <em/local-charset/
+
+The <tt/charset-hook/ command defines an alias for a character set.
+This is useful to properly display messages which are tagged with a
+character set name not known to mutt.
+
+The <tt/iconv-hook/ command defines a system-specific name for a
+character set.  This is helpful when your systems character
+conversion library insists on using strange, system-specific names
+for character sets.
 
-This command defines an alias for a character set.  This is useful
-to properly display messages which are tagged with a character set
-name not known to mutt.
 
 <sect1>Setting variables based upon mailbox<label id="folder-hook">
 <p>
diff --git a/doc/muttrc.man.head b/doc/muttrc.man.head
index a3a17050..26ba8365 100644
--- a/doc/muttrc.man.head
+++ b/doc/muttrc.man.head
@@ -111,6 +111,19 @@ This command defines an alias for a character set.  This is useful
 to properly display messages which are tagged with a character set
 name not known to mutt.
 .TP
+\fBiconv-hook\fP \fIcharset\fP \fIlocal-charset\fP
+This command defines a system-specific name for a character set.
+This is useful when your system's 
+.BR iconv (3)
+implementation does not understand MIME character set names (such as 
+.BR iso-8859-1 ),
+but instead insists on being fed with implementation-specific
+character set names (such as
+.BR 8859-1 ).
+In this specific case, you'd put this into your configuration file:
+.IP
+.B "iconv-hook iso-8859-1 8859-1"
+.TP
 \fBmessage-hook\fP [\fB!\fP]\fIpattern\fP \fIcommand\fP
 Before mutt displays (or formats for replying or forwarding) a
 message which matches the given \fIpattern\fP (or, when it is
diff --git a/doc/muttrc.man.tail b/doc/muttrc.man.tail
index c87e78cc..1c780dff 100644
--- a/doc/muttrc.man.tail
+++ b/doc/muttrc.man.tail
@@ -1,6 +1,8 @@
 .\" -*-nroff-*-
 .SH SEE ALSO
 .PP
+.BR iconv (1),
+.BR iconv (3),
 .BR mailcap (5),
 .BR maildir (5),
 .BR mbox (5),