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

diff --git a/doc/Makefile.in b/doc/Makefile.in
index eabce9a..4b820ec 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -45,11 +45,14 @@ DISTFILES = Makefile.in dotlock.man  	\
 	muttrc.man.tail			\
 	mbox.man			\
 	mmdf.man			\
-	manual.sgml.head		\
-	manual.sgml.tail		\
+	manual.xml.head			\
+	manual.xml.tail			\
 	instdoc.sh.in			\
 	patch-notes.txt			\
 	smime-notes.txt			\
+	muttng-manual.xsl		\
+	muttng-tex.xsl			\
+	muttng.sty			\
 	html.xsl chunk.xsl
 
 BUILT_DISTFILES = stamp-doc-xml stamp-doc-man stamp-doc-chunked \
@@ -62,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
@@ -83,11 +89,11 @@ install: all instdoc
 		$(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir) ; \
 	done
 	-$(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir) || true
-	-$(INSTALL) -m 644 manual.html $(DESTDIR)$(docdir) || true
 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/html
 	-cd html; for file in *.html ; do \
 		$(INSTALL) -m 644 $$file $(DESTDIR)$(docdir)/html/ || true ;\
 	done
+	-$(INSTALL) -m 644 muttng.css $(DESTDIR)$(docdir)/html || true
 
 uninstall:
 	for f in muttng.1 mutt_dotlock.1 fleang.1 muttng-flea.1 muttngbug.1 ; do \
@@ -96,30 +102,22 @@ uninstall:
 	for f in muttngrc.5 muttng-mbox.5  ; do \
 	  rm -f $(DESTDIR)$(mandir)/man5/$$f ; \
 	done
-	for f in $(srcdir_DOCFILES) $(topsrcdir_DOCFILES) ; do \
-	  rm -f $(DESTDIR)$(docdir)/$$f ; \
-	done
-	-rm -f $(DESTDIR)$(docdir)/manual.txt
-	-rm -f $(DESTDIR)$(docdir)/manual.html
-	-cd html; for f in *.html ; do \
-	  rm -f $(DESTDIR)$(docdir)/html/$$f ; \
-	done
-	-rmdir $(DESTDIR)$(docdir)/html
+	-rm -rf $(DESTDIR)$(docdir)/*
 
 check:
 manual.txt: manual.html
 	@HTML2TXT_CMD@
 
 manual.html: $(srcdir)/html.xsl manual.xml
-	-xsltproc --nonet -o $@ $^
+	-xsltproc --nonet --stringparam html.stylesheet muttng.css -o $@ $^
 	@HTMLCLEAN_CMD@ $@ || true
 
 manual-chunked stamp-doc-chunked: $(srcdir)/chunk.xsl manual.xml
 	test -d html || mkdir html
-	-xsltproc --nonet -o html/ $^
+	-xsltproc --nonet --stringparam html.stylesheet muttng.css -o html/ $^
 	touch stamp-doc-chunked
 	cd html; for file in *.html ; do \
-	  @HTMLCLEAN_CMD@ $file || true ; \
+	  @HTMLCLEAN_CMD@ $$file || true ; \
 	done
 	
 manual.pdf: stamp-doc-tex
@@ -131,12 +129,30 @@ manual.tex stamp-doc-tex: manual.xml
 	fi
 	touch stamp-doc-tex
 
+manual-ng.tex: manual.xml muttng-tex.xsl
+	xsltproc -o manual-ng.tex $(srcdir)/muttng-tex.xsl manual-pre.xml
+
+manual-ng.pdf: manual-ng.tex muttng.sty
+	(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 $(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
+	(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 $(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: 
 	rm -f *~ *.html *.orig *.rej stamp-doc-* *.ps mutt.1 muttrc.man
 	rm -f *.aux *.log *.tex *.out
 
 clean-real:
-	rm -f manual.txt manual.html manual.xml manual.pdf
+	rm -f manual.txt manual.html manual.xml manual-pre.xml manual.pdf
 	rm -rf html
 
 maintainer-clean: clean clean-real distclean
@@ -190,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 manual.sgml.head manual.sgml.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.sgml.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.sgml.tail > manual.xml
+		cat - $(srcdir)/manual.xml.tail > manual-pre.xml
+	-xsltproc --novalid --nonet $(srcdir)/muttng-manual.xsl manual-pre.xml > manual.xml
 	touch stamp-doc-xml
-