X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=blobdiff_plain;f=texi%2FMakefile.in;h=5b10e048b4ed2aeb857a4b39c99e5f9c7c732538;hp=d9958d4a16b3cee58548edaae08949111a9e9d04;hb=b7df893161350265e845a70d711a97a32536a221;hpb=1003ef003d894967ca5b5fe4a5f54919c1597d3f

diff --git a/texi/Makefile.in b/texi/Makefile.in
index d9958d4a1..5b10e048b 100644
--- a/texi/Makefile.in
+++ b/texi/Makefile.in
@@ -1,5 +1,6 @@
-infodir = @info_dir@
 prefix = @prefix@
+datarootdir = @datarootdir@
+infodir = @info_dir@
 srcdir = @srcdir@
 subdir = texi
 top_srcdir = @top_srcdir@
@@ -18,7 +19,9 @@ INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 SHELL = /bin/sh
 PAPERTYPE=a4
-INFO_DEPS=gnus message emacs-mime sieve pgg sasl
+INFO_DEPS=gnus message emacs-mime sieve pgg auth sasl
+REFCARD=gnus-refcard
+LOGO=gnus-logo
 
 all: $(INFO_DEPS)
 
@@ -28,7 +31,7 @@ most: texi2latex.elc latex latexps
 
 .texi:
 	if test "x$(MAKEINFO)" != "xno" ; then \
-	  $(MAKEINFO) -I $(srcdir) -o $* $<; \
+	  LC_ALL=C $(MAKEINFO) -I $(srcdir) --enable-encoding -o $* $<; \
 	else \
 	  rm -f $@; \
 	  $(EMACSINFO) $<; \
@@ -37,17 +40,17 @@ most: texi2latex.elc latex latexps
 # Files included in gnus.texi
 gnus.texi: gnus-faq.texi gnus-news.texi
 
-# FIXME: Target should be in parent directory.  A cvs commit script could
-# automatically create it.
-GNUS-NEWS:	gnus-news.texi
+# FIXME: A cvs commit script could automatically create it.
+GNUS-NEWS:	gnus-news.texi gnus-news.el
 	$(EMACSCOMP) -l $(srcdir)/gnus-news.el -f batch-gnus-news $< $@
+	mv $@ ../$@
 
-dvi: gnus.dvi message.dvi refcard.dvi emacs-mime.dvi sieve.dvi pgg.dvi sasl.dvi
+dvi: gnus.dvi message.dvi $(REFCARD).dvi emacs-mime.dvi sieve.dvi pgg.dvi auth.dvi sasl.dvi
 
-pdf: gnus.pdf message.pdf refcard.pdf emacs-mime.pdf sieve.pdf pgg.pdf sasl.pdf
+pdf: gnus.pdf message.pdf $(REFCARD).pdf emacs-mime.pdf sieve.pdf pgg.pdf auth.pdf sasl.pdf
 
 .texi.dvi :
-	sed -e '/@iflatex/,/@end iflatex/d' $< > gnustmp.texi 
+	sed -e '/@iflatex/,/@end iflatex/d' $< > gnustmp.texi
 	$(TEXI2DVI) -I $(srcdir) gnustmp.texi
 	cp gnustmp.dvi $*.dvi
 	rm -f gnustmp.*
@@ -56,38 +59,40 @@ pdf: gnus.pdf message.pdf refcard.pdf emacs-mime.pdf sieve.pdf pgg.pdf sasl.pdf
 	TEXPICTS=$(srcdir) $(DVIPS) -t $(PAPERTYPE) -f $< > $@
 
 .texi.pdf :
-	sed -e '/@iflatex/,/@end iflatex/d' $< > gnustmp.texi 
+	sed -e '/@iflatex/,/@end iflatex/d' $< > gnustmp.texi
 	$(TEXI2PDF) -I $(srcdir) gnustmp.texi
 	cp gnustmp.pdf $*.pdf
 	rm -f gnustmp.*
 
-refcard.dvi: refcard.tex gnuslogo-refcard.eps gnusref.tex
-	TEXINPUTS=$(srcdir):$$TEXINPUTS $(LATEX) refcard.tex
+$(LOGO).pdf:	$(LOGO).eps
+	epstopdf $< --outfile=$@
+
+$(REFCARD).dvi: $(REFCARD).tex $(LOGO).eps
+	TEXINPUTS=$(srcdir):$$TEXINPUTS:: $(LATEX) $(REFCARD).tex
 
-refcard.pdf: refcard.tex gnuslogo-refcard.eps gnusref.tex
-	epstopdf $(srcdir)/gnuslogo-refcard.eps --outfile=gnuslogo-refcard.pdf
-	TEXINPUTS=$(srcdir):$$TEXINPUTS $(PDFLATEX) refcard.tex
+$(REFCARD).pdf: $(REFCARD).tex $(LOGO).pdf
+	TEXINPUTS=$(srcdir):$$TEXINPUTS:: $(PDFLATEX) $(REFCARD).tex
 
-booklet.dvi: booklet.tex gnuslogo-refcard.eps gnusref.tex
+gnus-booklet.dvi: $(REFCARD).tex $(LOGO).eps
 	if [ "$(PAPERTYPE)" == a4 ]; then \
-		TEXINPUTS=$(srcdir):$$TEXINPUTS $(LATEX) bk-a4.tex && \
-		mv bk-a4.dvi booklet.dvi ;\
+	  TEXINPUTS=$(srcdir):$$TEXINPUTS:: \
+          $(LATEX) '\def\booklettrue{}\input{$(REFCARD)}' ;\
 	else \
-		TEXINPUTS=$(srcdir):$$TEXINPUTS $(LATEX) bk-lt.tex && \
-		mv bk-lt.dvi booklet.dvi;\
+	  TEXINPUTS=$(srcdir):$$TEXINPUTS:: \
+          $(LATEX) '\def\booklettrue{}\def\letterpapertrue{}\input{$(REFCARD)}' ;\
 	fi
+	mv $(REFCARD).dvi $@
 
-booklet.pdf: booklet.tex gnuslogo-refcard.eps gnusref.tex
-	epstopdf $(srcdir)/gnuslogo-booklet.eps --outfile=gnuslogo-booklet.pdf
+gnus-booklet.pdf: $(REFCARD).tex  $(LOGO).pdf
 	if [ "$(PAPERTYPE)" == a4 ]; then \
-		TEXINPUTS=$(srcdir):$$TEXINPUTS $(PDFLATEX) bk-a4.tex &&\
-		mv bk-a4.pdf booklet.pdf ;\
+	  TEXINPUTS=$(srcdir):$$TEXINPUTS:: \
+          $(PDFLATEX) -jobname=gnus-booklet '\def\booklettrue{}\input{$(REFCARD)}' ;\
 	else \
-		TEXINPUTS=$(srcdir):$$TEXINPUTS $(PDFLATEX) bk-lt.tex &&\
-		mv bk-lt.pdf booklet.pdf ;\
+	  TEXINPUTS=$(srcdir):$$TEXINPUTS:: \
+          $(PDFLATEX) -jobname=gnus-booklet '\def\booklettrue{}\def\letterpapertrue{}\input{$(REFCARD)}' ;\
 	fi
 
-clean:
+almost-clean:
 	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	\
@@ -96,15 +101,15 @@ clean:
 	thumbdta.tex xface.tex *.tpt gnus-manual-*.pdf gnus-manual-*.ps.gz
 
 makeinfo:
-	makeinfo -o gnus gnus.texi
-	makeinfo -o message message.texi
+	LC_ALL=C makeinfo --enable-encoding -o gnus gnus.texi
+	LC_ALL=C makeinfo --enable-encoding -o message message.texi
 
 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 message.latexi emacs-mime.latexi sieve.latexi pgg.latexi sasl.latexi gnus-news.latexi
+latex: gnus.latexi gnus-faq.latexi message.latexi emacs-mime.latexi sieve.latexi pgg.latexi auth.latexi sasl.latexi gnus-news.latexi
 
-gnus.latexi gnus-faq.latexi message.latexi emacs-mime.latexi sieve.latexi pgg.latexi sasl.latexi gnus-news.latexi: $(srcdir)/gnus.texi $(srcdir)/gnus-faq.texi $(srcdir)/message.texi $(srcdir)/emacs-mime.texi $(srcdir)/sieve.texi $(srcdir)/pgg.texi $(srcdir)/sasl.texi $(srcdir)/gnus-news.texi texi2latex.elc
+gnus.latexi gnus-faq.latexi message.latexi emacs-mime.latexi sieve.latexi pgg.latexi auth.latexi sasl.latexi gnus-news.latexi: $(srcdir)/gnus.texi $(srcdir)/gnus-faq.texi $(srcdir)/message.texi $(srcdir)/emacs-mime.texi $(srcdir)/sieve.texi $(srcdir)/pgg.texi $(srcdir)/sasl.texi $(srcdir)/gnus-news.texi texi2latex.elc
 	srcdir=$(srcdir) $(EMACSCOMP) -l ./texi2latex.elc -f latexi-translate
 
 .latexi.dvi-x:
@@ -178,32 +183,32 @@ latexboth: gnus-manual-a4.ps.gz gnus-manual-standard.ps.gz
 out:
 	scp gnus-manual-*.ps.gz gnus-manual-*.pdf www@quimby:html/gnus/documents
 
-veryclean: clean
+clean: almost-clean
 	rm -f gnus.dvi gnus.ps texi2latex.elc
 	rm -f gnus-manual-a4.* gnus-manual-standard.*
 
-distclean: veryclean
+distclean: clean
 	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)
+	$(SHELL) $(top_srcdir)/mkinstalldirs "$(infodir)"
 	@list='$(INFO_DEPS)'; \
 	for file in $$list; do \
 	  for ifile in `echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \
 	    if test -f $$ifile; then \
-	      echo " $(INSTALL_DATA) $$ifile $(infodir)/$$ifile"; \
-	      $(INSTALL_DATA) $$ifile $(infodir)/$$ifile; \
+	      echo "$(INSTALL_DATA) $$ifile \"$(infodir)/$$ifile\""; \
+	      $(INSTALL_DATA) $$ifile "$(infodir)/$$ifile"; \
 	    else : ; fi; \
 	  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 --info-dir=$(infodir) $(infodir)/$$file";\
-	    install-info --info-dir=$(infodir) $(infodir)/$$file || :;\
+	    echo "install-info --info-dir=\"$(infodir)\" \"$(infodir)/$$file\"";\
+	    install-info --info-dir="$(infodir)" "$(infodir)/$$file" || :;\
 	  done; \
 	else : ; fi
 
@@ -211,18 +216,18 @@ 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; \
+	    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 || :;\
+	    echo "install-info --delete --info-dir=\"$(infodir)\" \"$(infodir)/$$file\"";\
+	    install-info --delete --info-dir="$(infodir)" "$(infodir)/$$file" || :;\
 	  done; \
 	else : ; fi
 
-tmps: 
+tmps:
 	cd ps; make all
 	for j in ps/picons-*.ps; do \
 		i=ps/`basename $$j .ps`; \
@@ -238,7 +243,7 @@ tmps:
 		a="h"; echo -n "\\gnussmiley{$$i}"; fi done > smiley.tex; \
 		if [ -n "$$a" ]; then echo "{$$i}" >> smiley.tex; fi
 pspackage:
-	cd ps; make clean
+	cd ps; make almost-clean
 	tar czvf pspackage.tar.gz gnus-faq.texi gnus.texi herds misc pagestyle.sty picons pixidx.sty postamble.tex ps screen smilies splitindex texi2latex.el xface Makefile README etc
 
 Makefile: $(srcdir)/Makefile.in ../config.status