Merge commit 'upstream/1.5.21'

[software/mutt-debian.git] / doc / Makefile.am

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 7787c368f06a3992101a8010c5b4158f7be3db94..f97a668fe7b76b610f2f03d31bffefff7871fe33 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -10,6 +10,7 @@ MAKEDOC_CPP = $(CPP) $(AM_CPPFLAGS) $(DEFS) $(CPPFLAGS) -D_MAKEDOC -C
 noinst_PROGRAMS = makedoc
 
 EXTRA_DIST = dotlock.man               \
+        smime_keys.man                  \
        muttbug.man                     \
        mutt.man                        \
        PGP-Notes.txt                   \
@@ -27,12 +28,13 @@ EXTRA_DIST = dotlock.man            \
        smime-notes.txt                 \
        Muttrc Muttrc.head stamp-doc-rc \
        makedoc.c makedoc-defs.h        \
-       db-cleanup.xsl                  \
-       html.xsl chunk.xsl $(BUILT_DISTFILES)
+       mutt.css mutt.xsl html.xsl chunk.xsl $(BUILT_DISTFILES)
 
-HTML_DOCFILES = manual.html index.html intro.html gettingstarted.html \
+CHUNKED_DOCFILES = index.html intro.html gettingstarted.html \
        configuration.html mimesupport.html advancedusage.html \
-       optionalfeatures.html tuning.html reference.html miscellany.html
+       optionalfeatures.html security.html tuning.html reference.html miscellany.html
+
+HTML_DOCFILES = manual.html $(CHUNKED_DOCFILES)
 
 BUILT_DISTFILES = stamp-doc-xml stamp-doc-chunked manual.txt $(HTML_DOCFILES)
 
@@ -40,21 +42,21 @@ srcdir_DOCFILES = PGP-Notes.txt applying-patches.txt        \
        devel-notes.txt patch-notes.txt smime-notes.txt
 
 topsrcdir_DOCFILES = COPYRIGHT GPL INSTALL ChangeLog   \
-       ChangeLog.old                                   \
        README NEWS TODO README.SECURITY README.SSL 
 
 all: makedoc-all
 
-makedoc-all: mutt.1 muttrc.man manual.html stamp-doc-rc stamp-doc-chunked manual.txt
+makedoc-all: mutt.1 smime_keys.1 muttrc.man manual.html stamp-doc-rc stamp-doc-chunked manual.txt
 
 install-data-local: makedoc-all instdoc
        $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
        $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man5
        $(top_srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir)
        ./instdoc mutt.1 $(DESTDIR)$(mandir)/man1/mutt.1
+       ./instdoc smime_keys.1 $(DESTDIR)$(mandir)/man1/smime_keys.1
        ./instdoc $(srcdir)/muttbug.man $(DESTDIR)$(mandir)/man1/flea.1
        ./instdoc $(srcdir)/muttbug.man $(DESTDIR)$(mandir)/man1/muttbug.1
-       ./instdoc $(srcdir)/dotlock.man \
+       test x@DOTLOCK_TARGET@ = x || ./instdoc $(srcdir)/dotlock.man \
                $(DESTDIR)$(mandir)/man1/mutt_dotlock.1
        ./instdoc muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5
        ./instdoc $(srcdir)/mbox.man $(DESTDIR)$(mandir)/man5/mbox.5
@@ -80,7 +82,7 @@ install-data-local: makedoc-all instdoc
        fi
 
 uninstall-local:
-       for f in mutt.1 mutt_dotlock.1 flea.1 muttbug.1 ; do \
+       for f in mutt.1 mutt_dotlock.1 flea.1 muttbug.1 smime_keys.1; do \
                rm -f $(DESTDIR)$(mandir)/man1/$$f ; \
        done
        for f in muttrc.5 mbox.5 mmdf.5 ; do \
@@ -99,11 +101,10 @@ uninstall-local:
        done
 
 check:
-manual.txt: manual.html db-cleanup.xsl
-       -xsltproc --nonet -o manual-txt.html $(srcdir)/db-cleanup.xsl manual.html || cp manual.html manual-txt.html
-       -lynx -dump -nolist -with_backspaces manual-txt.html > $@ || \
-       w3m -dump manual-txt.html > $@ || \
-       elinks -dump -no-numbering -no-references manual-txt.html > $@
+manual.txt: manual.html
+       -LC_ALL=C lynx -dump -nolist -with_backspaces -display_charset=us-ascii manual.html > $@ || \
+       LC_ALL=C w3m -dump manual.html > $@ || \
+       LC_ALL=C elinks -dump -no-numbering -no-references manual.html | sed -e 's,\\001, ,g' > $@
 
 Muttrc: stamp-doc-rc
 
@@ -114,14 +115,14 @@ stamp-doc-rc: $(top_srcdir)/init.h makedoc$(EXEEXT) $(srcdir)/Muttrc.head
          $(top_srcdir)/init.h | ./makedoc$(EXEEXT) -c >> Muttrc
        touch stamp-doc-rc
 
-manual.html: $(srcdir)/html.xsl stamp-doc-xml
+manual.html: $(srcdir)/html.xsl $(srcdir)/mutt.xsl stamp-doc-xml $(srcdir)/mutt.css
        -xsltproc --nonet -o $@ $(srcdir)/html.xsl manual.xml
 
-stamp-doc-chunked: $(srcdir)/chunk.xsl stamp-doc-xml
+stamp-doc-chunked: $(srcdir)/chunk.xsl $(srcdir)/mutt.xsl stamp-doc-xml $(srcdir)/mutt.css
        -xsltproc --nonet $(srcdir)/chunk.xsl manual.xml
        touch stamp-doc-chunked
 
-$(HTML_DOCFILES): stamp-doc-chunked
+$(CHUNKED_DOCFILES): stamp-doc-chunked
 
 manual.pdf: manual.tex
        -if test -f manual.tex; then pdfjadetex manual.tex; fi
@@ -134,8 +135,19 @@ manual.tex: stamp-doc-xml
 validate: stamp-doc-xml
        xmllint --noout --noblanks --postvalid manual.xml
 
+spellcheck:
+       -aspell -d american --mode=sgml  --encoding=utf-8 -p $(srcdir)/mutt.pwl check manual.xml.head
+       -aspell -d american --mode=nroff --encoding=utf-8 -p $(srcdir)/mutt.pwl check muttrc.man.head
+       -aspell -d american --mode=ccpp  --encoding=utf-8 -p $(srcdir)/mutt.pwl check $(top_srcdir)/init.h
+
+sortcheck: manual.xml
+       sed -n -e '1,/^<sect1 id="variables">/d' -e '1,/^<sect1 id="functions">/s/<sect2 id="\([^"]*\)">/\1/p' < manual.xml > vars.tmp.1
+       sort < vars.tmp.1 > vars.tmp.2
+       cmp -s vars.tmp.1 vars.tmp.2 || diff -u vars.tmp.1 vars.tmp.2 | less
+       rm -rf vars.tmp.1 vars.tmp.2
+
 clean-local:
-       rm -f *~ *.html *.orig *.rej  stamp-doc-* *.ps mutt.1 muttrc.man
+       rm -f *~ *.html *.orig *.rej  stamp-doc-* *.ps mutt.1 smime_keys.1 muttrc.man
        rm -f *.aux *.log *.tex *.out
 
 DISTCLEANFILES=manual.txt manual.html manual.xml manual.pdf html \
@@ -159,6 +171,9 @@ EDIT = sed -e 's,@sysconfdir\@,$(sysconfdir),g' \
 mutt.1: $(srcdir)/mutt.man
        $(EDIT) $(srcdir)/mutt.man > $@
 
+smime_keys.1: $(srcdir)/smime_keys.man
+       $(EDIT) $(srcdir)/smime_keys.man > $@
+
 stamp-doc-xml: makedoc$(EXEEXT) $(top_srcdir)/init.h \
                manual.xml.head $(top_srcdir)/functions.h $(top_srcdir)/OPS* manual.xml.tail \
                $(srcdir)/gen-map-doc $(top_srcdir)/VERSION $(top_srcdir)/ChangeLog