X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=texi%2FMakefile.in;h=f33e109e5fc8d0875cc6f06b938ecd9ea5aeab23;hb=5ed7ff00b3f3bce83210faf41accaff0c4b15f30;hp=fb4f7eb28b2b0a7348389659287c8f88c922345e;hpb=8c23737913c25ec8136aede2a6b2e48687263019;p=gnus

diff --git a/texi/Makefile.in b/texi/Makefile.in
index fb4f7eb28..f33e109e5 100644
--- a/texi/Makefile.in
+++ b/texi/Makefile.in
@@ -1,4 +1,4 @@
-infodir = @infodir@
+infodir = @info_dir@
 prefix = @prefix@
 srcdir = @srcdir@
 subdir = texi
@@ -18,7 +18,7 @@ INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 SHELL = /bin/sh
 PAPERTYPE=a4
-INFO_DEPS=gnus message emacs-mime
+INFO_DEPS=gnus message emacs-mime sieve pgg sasl
 
 all: $(INFO_DEPS)
 
@@ -30,40 +30,70 @@ most: texi2latex.elc latex latexps
 	if test "x$(MAKEINFO)" != "xno" ; then \
 	  $(MAKEINFO) -I $(srcdir) -o $* $<; \
 	else \
+	  rm -f $@; \
 	  $(EMACSINFO) $<; \
 	fi
 
-dvi: tmps gnus.dvi message.dvi refcard.dvi emacs-mime.dvi
+# Files included in gnus.texi
+gnus.texi: gnus-faq.texi gnus-news.texi
 
-pdf: tmps gnus.pdf message.pdf refcard.pdf emacs-mime.pdf
+# FIXME: Target should be in parent directory.  A cvs commit script could
+# automatically create it.
+GNUS-NEWS:	gnus-news.texi
+	$(EMACSCOMP) -l $(srcdir)/gnus-news.el -f batch-gnus-news $< $@
+
+dvi: gnus.dvi message.dvi refcard.dvi emacs-mime.dvi sieve.dvi pgg.dvi sasl.dvi
+
+pdf: gnus.pdf message.pdf refcard.pdf emacs-mime.pdf sieve.pdf pgg.pdf sasl.pdf
 
 .texi.dvi :
 	sed -e '/@iflatex/,/@end iflatex/d' $< > gnustmp.texi 
 	$(TEXI2DVI) -I $(srcdir) gnustmp.texi
 	cp gnustmp.dvi $*.dvi
-	rm gnustmp.*
+	rm -f gnustmp.*
+
+.dvi.ps :
+	TEXPICTS=$(srcdir) $(DVIPS) -t $(PAPERTYPE) -f $< > $@
 
 .texi.pdf :
 	sed -e '/@iflatex/,/@end iflatex/d' $< > gnustmp.texi 
 	$(TEXI2PDF) -I $(srcdir) gnustmp.texi
 	cp gnustmp.pdf $*.pdf
-	rm gnustmp.*
+	rm -f gnustmp.*
 
-refcard.dvi: refcard.tex gnuslogo.refcard gnusref.tex
+refcard.dvi: refcard.tex gnuslogo-refcard.eps gnusref.tex
 	TEXINPUTS=$(srcdir):$$TEXINPUTS $(LATEX) refcard.tex
 
-
-refcard.pdf: refcard.tex gnuslogo.refcard gnusref.tex
-	epstopdf $(srcdir)/gnuslogo.refcard --outfile=gnuslogo.refcard.pdf
+refcard.pdf: refcard.tex gnuslogo-refcard.eps gnusref.tex
+	epstopdf $(srcdir)/gnuslogo-refcard.eps --outfile=gnuslogo-refcard.pdf
 	TEXINPUTS=$(srcdir):$$TEXINPUTS $(PDFLATEX) refcard.tex
 
+booklet.dvi: booklet.tex gnuslogo-refcard.eps gnusref.tex
+	if [ "$(PAPERTYPE)" == a4 ]; then \
+		TEXINPUTS=$(srcdir):$$TEXINPUTS $(LATEX) bk-a4.tex && \
+		mv bk-a4.dvi booklet.dvi ;\
+	else \
+		TEXINPUTS=$(srcdir):$$TEXINPUTS $(LATEX) bk-lt.tex && \
+		mv bk-lt.dvi booklet.dvi;\
+	fi
+
+booklet.pdf: booklet.tex gnuslogo-refcard.eps gnusref.tex
+	epstopdf $(srcdir)/gnuslogo-booklet.eps --outfile=gnuslogo-booklet.pdf
+	if [ "$(PAPERTYPE)" == a4 ]; then \
+		TEXINPUTS=$(srcdir):$$TEXINPUTS $(PDFLATEX) bk-a4.tex &&\
+		mv bk-a4.pdf booklet.pdf ;\
+	else \
+		TEXINPUTS=$(srcdir):$$TEXINPUTS $(PDFLATEX) bk-lt.tex &&\
+		mv bk-lt.pdf booklet.pdf ;\
+	fi
+
 clean:
-	rm -f gnus.*.bak *.ky *.cp *.fn *.cps *.kys *.log *.aux *.dvi *.vr \
-	*.pdf *.tp *.toc *.pg gnus.latexi *.aux *.[cgk]idx \
-	gnus.ilg gnus.ind gnus.[cgk]ind gnus.idx \
-	gnustmp.texi *.tmplatexi gnus.tmplatexi1 texput.log *.orig *.rej \
-	gnus.latexi*~* xface.tex picons.tex smiley.tex *.latexi *.dvi-x \
-	*.pdf-x
+	rm -f *.[cgk]idx *.aux *.cp *.cps *.dvi *.dvi-x *.fn *.ky	\
+	*.kys *.latexi *.log *.orig *.pdf *.pdf-x *.pg *.rej		\
+	*.tmplatexi *.toc *.tp *.vr gnus.*.bak gnus.[cgk]ind gnus.idx	\
+	gnus.ilg gnus.ind gnus.latexi*~* gnus.out gnus.tmplatexi1	\
+	gnustmp.texi picons.tex smiley.tex texput.log thumb*.png	\
+	thumbdta.tex xface.tex *.tpt gnus-manual-*.pdf gnus-manual-*.ps.gz
 
 makeinfo:
 	makeinfo -o gnus gnus.texi
@@ -72,15 +102,15 @@ makeinfo:
 texi2latex.elc: texi2latex.el
 	srcdir=$(srcdir)/../lisp $(EMACSCOMP) -l $(srcdir)/../lisp/dgnushack.el --eval '(byte-compile-file "$(srcdir)/texi2latex.el")'
 
-latex: gnus.latexi gnus-faq.latexi
+latex: gnus.latexi gnus-faq.latexi message.latexi emacs-mime.latexi sieve.latexi pgg.latexi sasl.latexi
 
-gnus.latexi gnus-faq.latexi message.latexi emacs-mime.latexi: $(srcdir)/gnus.texi $(srcdir)/gnus-faq.texi $(srcdir)/message.texi $(srcdir)/emacs-mime.texi texi2latex.elc
+gnus.latexi gnus-faq.latexi message.latexi emacs-mime.latexi sieve.latexi pgg.latexi sasl.latexi: $(srcdir)/gnus.texi $(srcdir)/gnus-faq.texi $(srcdir)/message.texi $(srcdir)/emacs-mime.texi $(srcdir)/sieve.texi $(srcdir)/pgg.texi $(srcdir)/sasl.texi texi2latex.elc
 	srcdir=$(srcdir) $(EMACSCOMP) -l ./texi2latex.elc -f latexi-translate
 
 .latexi.dvi-x:
 	make gnusconfig.tex
 	make tmps
-	rm -f gnus.aux
+	rm -f gnus.aux gnus.toc
 	cp $< gnus.tmplatexi
 	TEXINPUTS=$(srcdir):$$TEXINPUTS $(LATEX) gnus.tmplatexi
 	$(srcdir)/splitindex
@@ -99,7 +129,7 @@ gnus.latexi gnus-faq.latexi message.latexi emacs-mime.latexi: $(srcdir)/gnus.tex
 	make gnusconfig.tex
 	make tmps
 	cd ps; make pdf
-	rm -f gnus.aux
+	rm -f gnus.aux gnus.toc
 	cp $< gnus.tmplatexi
 	TEXINPUTS=$(srcdir):$$TEXINPUTS $(PDFLATEX) gnus.tmplatexi
 	$(srcdir)/splitindex
@@ -111,11 +141,12 @@ gnus.latexi gnus-faq.latexi message.latexi emacs-mime.latexi: $(srcdir)/gnus.tex
 	egrep -v "end\{document\}" $< > gnus.tmplatexi
 	cat $(srcdir)/postamble.tex >> gnus.tmplatexi
 	TEXINPUTS=$(srcdir):$$TEXINPUTS $(PDFLATEX) gnus.tmplatexi
-	TEXINPUTS=$(srcdir):$$TEXINPUTS $(PDFLATEX) gnus.tmplatexi
+	#thumbpdf gnus.pdf
+	#TEXINPUTS=$(srcdir):$$TEXINPUTS $(PDFLATEX) gnus.tmplatexi
 	mv gnus.pdf $@
 
 latexps: gnus.dvi-x
-	TEXINPUTS=$(srcdir):$$TEXINPUTS $(DVIPS) -t a4 -f $< > gnus.ps
+	TEXPICTS=$(srcdir) $(DVIPS) -t a4 -f $< > gnus.ps
 
 latexpdf: gnus.pdf-x
 	mv gnus.pdf-x gnus.pdf
@@ -127,10 +158,10 @@ gnus-manual-standard.latexi: gnus.latexi
 	sed 's/,a4paper/,letterpaper/' $< > $@
 
 gnus-manual-a4.ps.gz: gnus-manual-a4.dvi-x
-	TEXINPUTS=$(srcdir):$$TEXINPUTS $(DVIPS) -t a4 -f $< | gzip -c > $@
+	TEXPICTS=$(srcdir) $(DVIPS) -t a4 -f $< | gzip -c > $@
 
 gnus-manual-standard.ps.gz: gnus-manual-standard.dvi-x
-	TEXINPUTS=$(srcdir):$$TEXINPUTS $(DVIPS) -t letter -f $< | gzip -c > $@
+	TEXPICTS=$(srcdir) $(DVIPS) -t letter -f $< | gzip -c > $@
 
 pdfs: gnus-manual-a4.pdf-x gnus-manual-standard.pdf-x
 	mv gnus-manual-a4.pdf-x gnus-manual-a4.pdf
@@ -145,12 +176,7 @@ psout: latexboth out
 latexboth: gnus-manual-a4.ps.gz gnus-manual-standard.ps.gz
 
 out:
-	cp gnus-manual-standard.ps.gz \
-	gnus-manual-a4.ps.gz \
-	/local/ftp/pub/emacs/gnus/manual
-	mv gnus-manual-standard.ps.gz \
-	gnus-manual-a4.ps.gz \
-	/hom/larsi/www_docs/www.gnus.org/documents
+	scp gnus-manual-*.ps.gz gnus-manual-*.pdf www@quimby:html/gnus/documents
 
 veryclean: clean
 	rm -f gnus.dvi gnus.ps texi2latex.elc
@@ -160,6 +186,7 @@ distclean: veryclean
 	rm -f *.orig *.rej *.elc *~ gnus-[0-9] gnus-[0-9][0-9] Makefile
 	rm -f message-[0-9]
 	rm -f $(INFO_DEPS)
+	rm -f gnusconfig.tex
 
 install: $(INFO_DEPS)
 	$(SHELL) $(top_srcdir)/mkinstalldirs $(infodir)
@@ -180,6 +207,21 @@ install: $(INFO_DEPS)
 	  done; \
 	else : ; fi
 
+uninstall:
+	@list='$(INFO_DEPS)'; \
+	for file in $$list; do \
+	  for ifile in `echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \
+	    rm -f $(infodir)/$$ifile; \
+	  done; \
+	done
+	@if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
+	  list='$(INFO_DEPS)'; \
+	  for file in $$list; do \
+	    echo " install-info --delete --info-dir=$(infodir) $(infodir)/$$file";\
+	    install-info --delete --info-dir=$(infodir) $(infodir)/$$file || :;\
+	  done; \
+	else : ; fi
+
 tmps: 
 	cd ps; make all
 	for j in ps/picons-*.ps; do \