X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=doc%2FMakefile.in;h=4b820ecc06bcaf0883fbf0421d5eb6ba0fd977b2;hp=4d35221e4aa6b9748f7231e7c9f58def41c9a0ee;hb=3cb53df6efcb6b137bbab53c16da4eddbc5a1b2b;hpb=6f41c52076e60ae7f2b6337b7dc9ea3fa23400e2

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 4d35221..4b820ec 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -65,7 +65,10 @@ srcdir_DOCFILES = PGP-Notes.txt applying-patches.txt	\
 topsrcdir_DOCFILES = COPYRIGHT GPL INSTALL ChangeLog	\
 	UPGRADING README NEWS TODO TODO.mutt-ng README.SSL 
 
-all: muttng.1 muttrc.man manual.html stamp-doc-chunked manual.txt
+all: ../makedoc$(EXEEXT)
+	$(MAKE) makedoc-all
+
+makedoc-all: muttng.1 muttrc.man manual.html stamp-doc-chunked manual.txt
 
 install: all instdoc
 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
@@ -127,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: 
@@ -203,9 +206,9 @@ muttrc.man stamp-doc-man: ../makedoc$(EXEEXT) $(top_srcdir)/init.h muttrc.man.he
 		> muttrc.man
 	touch stamp-doc-man
 
-manual.xml stamp-doc-xml: ../makedoc$(EXEEXT) $(top_srcdir)/init.h muttng-manual.xsl manual.xml.head manual.xml.tail $(top_srcdir)/VERSION.in $(top_srcdir)/VERSION.svn
-	( sed -e "s/@VERSION\@/`cat $(top_srcdir)/VERSION.in`-r`cat $(top_srcdir)/VERSION.svn`/" $(srcdir)/manual.xml.head ;\
+manual.xml stamp-doc-xml: ../makedoc$(EXEEXT) $(top_srcdir)/init.h muttng-manual.xsl manual.xml.head manual.xml.tail $(top_srcdir)/VERSION.in
+	( sed -e "s/@VERSION\@/`cat $(top_srcdir)/VERSION.in`-rgit/" $(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