Merge commit 'upstream/1.5.21'

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

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 2490b7d793b110fd0acf6ddd38a346768c387848..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               \
 noinst_PROGRAMS = makedoc
 
 EXTRA_DIST = dotlock.man               \

+        smime_keys.man                  \

        muttbug.man                     \
        mutt.man                        \
        PGP-Notes.txt                   \
        muttbug.man                     \
        mutt.man                        \
        PGP-Notes.txt                   \


@@ -29,9 +30,11 @@ EXTRA_DIST = dotlock.man             \
        makedoc.c makedoc-defs.h        \
        mutt.css mutt.xsl html.xsl chunk.xsl $(BUILT_DISTFILES)
 
        makedoc.c makedoc-defs.h        \
        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 \
        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)
 
 
 BUILT_DISTFILES = stamp-doc-xml stamp-doc-chunked manual.txt $(HTML_DOCFILES)
 


@@ -43,13 +46,14 @@ topsrcdir_DOCFILES = COPYRIGHT GPL INSTALL ChangeLog        \
 
 all: makedoc-all
 
 
 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
 
 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
        test x@DOTLOCK_TARGET@ = x || ./instdoc $(srcdir)/dotlock.man \
        ./instdoc $(srcdir)/muttbug.man $(DESTDIR)$(mandir)/man1/flea.1
        ./instdoc $(srcdir)/muttbug.man $(DESTDIR)$(mandir)/man1/muttbug.1
        test x@DOTLOCK_TARGET@ = x || ./instdoc $(srcdir)/dotlock.man \


@@ -78,7 +82,7 @@ install-data-local: makedoc-all instdoc
        fi
 
 uninstall-local:
        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 \
                rm -f $(DESTDIR)$(mandir)/man1/$$f ; \
        done
        for f in muttrc.5 mbox.5 mmdf.5 ; do \


@@ -98,7 +102,7 @@ uninstall-local:
 
 check:
 manual.txt: manual.html
 
 check:
 manual.txt: manual.html

-       -LC_ALL=C lynx -dump -nolist -with_backspaces 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' > $@
 
        LC_ALL=C w3m -dump manual.html > $@ || \
        LC_ALL=C elinks -dump -no-numbering -no-references manual.html | sed -e 's,\\001, ,g' > $@
 


@@ -118,7 +122,7 @@ stamp-doc-chunked: $(srcdir)/chunk.xsl $(srcdir)/mutt.xsl stamp-doc-xml $(srcdir
        -xsltproc --nonet $(srcdir)/chunk.xsl manual.xml
        touch stamp-doc-chunked
 
        -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
 
 manual.pdf: manual.tex
        -if test -f manual.tex; then pdfjadetex manual.tex; fi


@@ -132,11 +136,18 @@ validate: stamp-doc-xml
        xmllint --noout --noblanks --postvalid manual.xml
 
 spellcheck:
        xmllint --noout --noblanks --postvalid manual.xml
 
 spellcheck:

-       -aspell -l en --mode sgml -c manual.xml.head && \
-       -aspell -l en --mode nroff -c muttrc.man.head
+       -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:
 
 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 \
        rm -f *.aux *.log *.tex *.out
 
 DISTCLEANFILES=manual.txt manual.html manual.xml manual.pdf html \


@@ -160,6 +171,9 @@ EDIT = sed -e 's,@sysconfdir\@,$(sysconfdir),g' \
 mutt.1: $(srcdir)/mutt.man
        $(EDIT) $(srcdir)/mutt.man > $@
 
 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
 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