From: Lars Noschinski <cebewee@gmx.de>

Rocco Rutte:
- fix manual building if srcdir!=builddir

git-svn-id: svn://svn.berlios.de/mutt-ng/trunk@791 e385b8ad-14ed-0310-8656-cc95a2468c6d

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 3596138..b07b92f 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -130,21 +130,21 @@ manual.tex stamp-doc-tex: manual.xml
        touch stamp-doc-tex
 
 manual-ng.tex: manual.xml muttng-tex.xsl
-       xsltproc -o manual-ng.tex muttng-tex.xsl manual-pre.xml
+       xsltproc -o manual-ng.tex $(srcdir)/muttng-tex.xsl manual-pre.xml
 
 manual-ng.pdf: manual-ng.tex muttng.sty
-       pdflatex -file-line-error manual-ng.tex
-       pdflatex -file-line-error manual-ng.tex
+       (BD=`pwd`; cd $(srcdir); pdflatex -file-line-error -output-directory $$BD $(builddir)/manual-ng.tex)
+       (BD=`pwd`; cd $(srcdir); pdflatex -file-line-error -output-directory $$BD $(builddir)/manual-ng.tex)
        touch manual-ng.idx
-       makeindex -s muttng.ist -o manual-ng.ind manual-ng.idx
-       pdflatex -file-line-error manual-ng.tex
+       makeindex -s $(srcdir)/muttng.ist -o manual-ng.ind manual-ng.idx
+       (BD=`pwd`; cd $(srcdir); pdflatex -file-line-error -output-directory $$BD $(builddir)/manual-ng.tex)
 
 manual-ng.ps: manual-ng.tex muttng.sty
-       latex -file-line-error manual-ng.tex
-       latex -file-line-error manual-ng.tex
+       (BD=`pwd`; cd $(srcdir); latex -file-line-error -output-directory $$BD $(builddir)/manual-ng.tex)
+       (BD=`pwd`; cd $(srcdir); latex -file-line-error -output-directory $$BD $(builddir)/manual-ng.tex)
        touch manual-ng.idx
-       makeindex -s muttng.ist -o manual-ng.ind manual-ng.idx
-       latex -file-line-error manual-ng.tex
+       makeindex -s $(srcdir)/muttng.ist -o manual-ng.ind manual-ng.idx
+       (BD=`pwd`; cd $(srcdir); latex -file-line-error -output-directory $$BD $(builddir)/manual-ng.tex)
        dvips -o manual-ng.ps manual-ng.dvi
 
 clean: 
@@ -210,5 +210,5 @@ manual.xml stamp-doc-xml: ../makedoc$(EXEEXT) $(top_srcdir)/init.h muttng-manual
        ( sed -e "s/@VERSION\@/`cat $(top_srcdir)/VERSION.in`-r`cat $(top_srcdir)/VERSION.svn`/" $(srcdir)/manual.xml.head ;\
          $(MAKEDOC_CPP) $(top_srcdir)/init.h | ../makedoc -s ) |      \
                cat - $(srcdir)/manual.xml.tail > manual-pre.xml
-       -xsltproc --novalid --nonet muttng-manual.xsl manual-pre.xml > manual.xml
+       -xsltproc --novalid --nonet $(srcdir)/muttng-manual.xsl manual-pre.xml > manual.xml
        touch stamp-doc-xml

diff --git a/doc/manual.txt b/doc/manual.txt
index af554fc..1da7233 100644 (file)
--- a/doc/manual.txt
+++ b/doc/manual.txt
@@ -9,7 +9,7 @@ Michael Elkins
 
    <m\bme\be@\b@c\bcs\bs.\b.h\bhm\bmc\bc.\b.e\bed\bdu\bu>
 
-   version devel-r553
+   version devel-r790
 
    _\bA_\bb_\bs_\bt_\br_\ba_\bc_\bt
 
@@ -7011,8 +7011,18 @@ Chapter 7. Reference
    Value:
 
    _\bT_\bh_\bi_\bs_\b _\bi_\bs_\b _\ba_\b _\br_\be_\ba_\bd_\b-_\bo_\bn_\bl_\by_\b _\bs_\by_\bs_\bt_\be_\bm_\b _\bp_\br_\bo_\bp_\be_\br_\bt_\by_\b _\ba_\bn_\bd_\b,_\b _\ba_\bt_\b _\br_\bu_\bn_\bt_\bi_\bm_\be_\b,_\b _\bs_\bp_\be_\bc_\bi_\bf_\bi_\be_\bs_\b _\bt_\bh_\be
-   _\bl_\ba_\bs_\bt_\b _\bp_\ba_\br_\bt_\b _\bo_\bf_\b _\bt_\bh_\be_\b _\bf_\bu_\bl_\bl_\b _\bp_\ba_\bt_\bh_\b _\bo_\br_\b _\bU_\bR_\bI_\b _\bo_\bf_\b _\bt_\bh_\be_\b _\bf_\bo_\bl_\bd_\be_\br_\b _\bc_\bu_\br_\br_\be_\bn_\bt_\bl_\by_\b _\bo_\bp_\be_\bn_\b _\b(_\bi_\bf
-   _\ba_\bn_\by_\b)_\b,_\b _\bi_\b._\be_\b._\b _\be_\bv_\be_\br_\by_\bt_\bh_\bi_\bn_\bg_\b _\ba_\bf_\bt_\be_\br_\b _\bt_\bh_\be_\b _\bl_\ba_\bs_\bt_\b _\b`_\b`_\b/_\b'_\b'_\b.
+   _\ba_\bc_\bt_\bu_\ba_\bl_\b _\bn_\ba_\bm_\be_\b _\bo_\bf_\b _\bt_\bh_\be_\b _\bf_\bo_\bl_\bd_\be_\br_\b _\ba_\bs_\b _\bf_\ba_\br_\b _\ba_\bs_\b _\bi_\bt_\b _\bc_\bo_\bu_\bl_\bd_\b _\bb_\be_\b _\bd_\be_\bt_\be_\bc_\bt_\be_\bd_\b.
+
+   For detection, $folder is first taken into account and simply stripped
+   to form the result when a match is found. For example, with $folder
+   being imap://host and the folder is imap://host/INBOX/foo,
+   $muttng_folder_name will be just INBOX/foo.)
+
+   Second, if the initial portion of a name is not $folder, the result
+   will be everything after the last ``/''.
+
+   Third and last, the result will be just the name if neither $folder
+   nor a ``/'' were found in the name.
 
 154. $muttng_folder_path
 
@@ -7045,7 +7055,7 @@ Chapter 7. Reference
 
    Type: system property
 
-   Value: 553
+   Value: 790
 
    _\bT_\bh_\bi_\bs_\b _\bi_\bs_\b _\ba_\b _\br_\be_\ba_\bd_\b-_\bo_\bn_\bl_\by_\b _\bs_\by_\bs_\bt_\be_\bm_\b _\bp_\br_\bo_\bp_\be_\br_\bt_\by_\b _\ba_\bn_\bd_\b _\bs_\bp_\be_\bc_\bi_\bf_\bi_\be_\bs_\b _\bm_\bu_\bt_\bt_\bn_\bg_\b'_\bs_\b _\bs_\bu_\bb_\bv_\be_\br_\bs_\bi_\bo_\bn
    _\br_\be_\bv_\bi_\bs_\bi_\bo_\bn_\b _\bs_\bt_\br_\bi_\bn_\bg_\b.
@@ -9143,7 +9153,7 @@ Chapter 7. Reference
 
    Type: boolean
 
-   Default: yes
+   Default: no
 
    Availability: SSL