From f98da767a1df0098d7b8a343e8416e489484fb85 Mon Sep 17 00:00:00 2001 From: pdmef Date: Tue, 14 Mar 2006 10:36:31 +0000 Subject: [PATCH] From: Lars Noschinski Rocco Rutte: - fix manual building if srcdir!=builddir git-svn-id: svn://svn.berlios.de/mutt-ng/trunk@791 e385b8ad-14ed-0310-8656-cc95a2468c6d --- doc/Makefile.in | 20 ++++++++++---------- doc/manual.txt | 20 +++++++++++++++----- 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/doc/Makefile.in b/doc/Makefile.in index 3596138..b07b92f 100644 --- 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 --- a/doc/manual.txt +++ b/doc/manual.txt @@ -9,7 +9,7 @@ Michael Elkins - version devel-r553 + version devel-r790 _A_b_s_t_r_a_c_t @@ -7011,8 +7011,18 @@ Chapter 7. Reference Value: _T_h_i_s_ _i_s_ _a_ _r_e_a_d_-_o_n_l_y_ _s_y_s_t_e_m_ _p_r_o_p_e_r_t_y_ _a_n_d_,_ _a_t_ _r_u_n_t_i_m_e_,_ _s_p_e_c_i_f_i_e_s_ _t_h_e - _l_a_s_t_ _p_a_r_t_ _o_f_ _t_h_e_ _f_u_l_l_ _p_a_t_h_ _o_r_ _U_R_I_ _o_f_ _t_h_e_ _f_o_l_d_e_r_ _c_u_r_r_e_n_t_l_y_ _o_p_e_n_ _(_i_f - _a_n_y_)_,_ _i_._e_._ _e_v_e_r_y_t_h_i_n_g_ _a_f_t_e_r_ _t_h_e_ _l_a_s_t_ _`_`_/_'_'_. + _a_c_t_u_a_l_ _n_a_m_e_ _o_f_ _t_h_e_ _f_o_l_d_e_r_ _a_s_ _f_a_r_ _a_s_ _i_t_ _c_o_u_l_d_ _b_e_ _d_e_t_e_c_t_e_d_. + + 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 _T_h_i_s_ _i_s_ _a_ _r_e_a_d_-_o_n_l_y_ _s_y_s_t_e_m_ _p_r_o_p_e_r_t_y_ _a_n_d_ _s_p_e_c_i_f_i_e_s_ _m_u_t_t_n_g_'_s_ _s_u_b_v_e_r_s_i_o_n _r_e_v_i_s_i_o_n_ _s_t_r_i_n_g_. @@ -9143,7 +9153,7 @@ Chapter 7. Reference Type: boolean - Default: yes + Default: no Availability: SSL -- 2.20.1