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

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 3e4e3a9..f227f25 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -50,6 +50,7 @@ DISTFILES = Makefile.in dotlock.man  	\
 	instdoc.sh.in			\
 	patch-notes.txt			\
 	smime-notes.txt			\
+	muttng-manual.xsl		\
 	html.xsl chunk.xsl
 
 BUILT_DISTFILES = stamp-doc-xml stamp-doc-man stamp-doc-chunked \
@@ -83,8 +84,6 @@ 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 ;\
@@ -98,32 +97,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
-	-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 muttng.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 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
@@ -140,7 +129,7 @@ clean:
 	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
@@ -194,9 +183,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
+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 ;\
 	  $(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 muttng-manual.xsl manual-pre.xml > manual.xml
 	touch stamp-doc-xml
-