X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=doc%2FMakefile.in;h=bd981b38b5e62f703c780eb53b4bfb9b16b96792;hp=3e4e3a9766158ac3250613146a646299695377e7;hb=6ebff74ad242d4c56fb7762965b19cee14fd2daa;hpb=f7f52358a72c7bc02e201dd03bd7f75869681a52

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 3e4e3a9..bd981b3 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -36,7 +36,6 @@ INCLUDES = -I. -I.. -I$(includedir) -I$(top_srcdir)
 MAKEDOC_CPP = $(CPP) $(INCLUDES) $(DEFS) $(CPPFLAGS) -D_MAKEDOC -C 
 
 DISTFILES = Makefile.in dotlock.man  	\
-	muttbug.man			\
 	mutt.man			\
 	PGP-Notes.txt			\
 	applying-patches.txt		\
@@ -45,11 +44,14 @@ DISTFILES = Makefile.in dotlock.man  	\
 	muttrc.man.tail			\
 	mbox.man			\
 	mmdf.man			\
-	manual.xml.head		\
-	manual.xml.tail		\
+	manual.xml.head			\
+	manual.xml.tail			\
 	instdoc.sh.in			\
 	patch-notes.txt			\
 	smime-notes.txt			\
+	madmutt-manual.xsl		\
+	madmutt-tex.xsl			\
+	madmutt.sty			\
 	html.xsl chunk.xsl
 
 BUILT_DISTFILES = stamp-doc-xml stamp-doc-man stamp-doc-chunked \
@@ -62,19 +64,19 @@ 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: madmutt.1 muttrc.man manual.html stamp-doc-chunked manual.txt
 
 install: all instdoc
 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man5
-	./instdoc muttng.1 $(DESTDIR)$(mandir)/man1/muttng.1
-	./instdoc $(srcdir)/muttbug.man $(DESTDIR)$(mandir)/man1/muttng-flea.1
-	echo ".so $(mandir)/man1/muttng-flea.1" > $(DESTDIR)$(mandir)/man1/muttngbug.1
-	echo ".so $(mandir)/man1/muttng-flea.1" > $(DESTDIR)$(mandir)/man1/fleang.1
+	./instdoc madmutt.1 $(DESTDIR)$(mandir)/man1/madmutt.1
 	./instdoc $(srcdir)/dotlock.man \
-		$(DESTDIR)$(mandir)/man1/muttng_dotlock.1
-	./instdoc muttrc.man $(DESTDIR)$(mandir)/man5/muttngrc.5
-	./instdoc $(srcdir)/mbox.man $(DESTDIR)$(mandir)/man5/muttng-mbox.5
+		$(DESTDIR)$(mandir)/man1/madmutt_dotlock.1
+	./instdoc muttrc.man $(DESTDIR)$(mandir)/man5/madmuttrc.5
+	./instdoc $(srcdir)/mbox.man $(DESTDIR)$(mandir)/man5/madmutt-mbox.5
 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)
 	for f in $(topsrcdir_DOCFILES) ; do \
 		$(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; \
@@ -83,47 +85,35 @@ 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
-	-$(INSTALL) -m 644 muttng.css $(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
+	-$(INSTALL) -m 644 madmutt.css $(DESTDIR)$(docdir)/html || true
 
 uninstall:
-	for f in muttng.1 mutt_dotlock.1 fleang.1 muttng-flea.1 muttngbug.1 ; do \
+	for f in madmutt.1 mutt_dotlock.1 madmutt-flea.1 ; do \
 	  rm -f $(DESTDIR)$(mandir)/man1/$$f ; \
 	done
-	for f in muttngrc.5 muttng-mbox.5  ; do \
+	for f in madmuttrc.5 madmutt-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
-	-rm -rf $(DESTDIR)$(docdir)/muttng.css
-	-rm -rf $(DESTDIR)$(docdir)/html/muttng.css
-	-rmdir $(DESTDIR)$(docdir)/html
+	-rm -rf $(DESTDIR)$(docdir)/*
 
 check:
 manual.txt: manual.html
 	@HTML2TXT_CMD@
 
 manual.html: $(srcdir)/html.xsl manual.xml
-	-xsltproc --stringparam html.stylesheet muttng.css --nonet -o $@ $^
+	-xsltproc --nonet --stringparam html.stylesheet madmutt.css -o $@ $^
 	@HTMLCLEAN_CMD@ $@ || true
 
 manual-chunked stamp-doc-chunked: $(srcdir)/chunk.xsl manual.xml
 	test -d html || mkdir html
-	-xsltproc --stringparam html.stylesheet muttng.css --nonet -o html/ $^
+	-xsltproc --nonet --stringparam html.stylesheet madmutt.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
@@ -135,12 +125,30 @@ manual.tex stamp-doc-tex: manual.xml
 	fi
 	touch stamp-doc-tex
 
+manual-ng.tex: manual.xml madmutt-tex.xsl
+	xsltproc -o manual-ng.tex $(srcdir)/madmutt-tex.xsl manual-pre.xml
+
+manual-ng.pdf: manual-ng.tex madmutt.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)/madmutt.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 madmutt.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)/madmutt.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
@@ -185,7 +193,7 @@ EDIT=sed -e 's,@sysconfdir\@,$(sysconfdir),g' \
      -e 's,@bindir\@,$(bindir),g' \
      -e 's,@docdir\@,$(docdir),g'
 
-muttng.1: $(srcdir)/mutt.man
+madmutt.1: $(srcdir)/mutt.man
 	$(EDIT) $(srcdir)/mutt.man > $@
 
 muttrc.man stamp-doc-man: ../makedoc$(EXEEXT) $(top_srcdir)/init.h muttrc.man.head muttrc.man.tail
@@ -194,9 +202,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.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 madmutt-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.xml
+		cat - $(srcdir)/manual.xml.tail > manual-pre.xml
+	-xsltproc --novalid --nonet $(srcdir)/madmutt-manual.xsl manual-pre.xml > manual.xml
 	touch stamp-doc-xml
-