From: yamaoka <yamaoka>
Date: Thu, 31 Mar 2005 10:43:34 +0000 (+0000)
Subject: Synch to No Gnus 200503301541.
X-Git-Tag: t-gnus-6_17_4-quimby-~518
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7a38124d4abeb1861a470e5e5ec62917ee29af90;p=elisp%2Fgnus.git-

Synch to No Gnus 200503301541.
---

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 32ed305..fbd0a0f 100644
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,9 @@
+2005-03-30  Reiner Steib  <Reiner.Steib@gmx.de>
+
+	* Makefile.in (gnus-booklet.dvi, gnus-booklet.pdf): Simplify.
+	(gnus-faq-texi): Renamed from gnus-faq.texi to avoid unsolicited
+	download.
+
 2005-03-29  Reiner Steib  <Reiner.Steib@gmx.de>
 
 	* Makefile.in (gnus-booklet.dvi, gnus-booklet.pdf)
diff --git a/texi/Makefile.in b/texi/Makefile.in
index 779958b..b59c320 100644
--- a/texi/Makefile.in
+++ b/texi/Makefile.in
@@ -117,26 +117,24 @@ $(REFCARD).pdf: $(REFCARD).tex $(LOGO).pdf
 gnus-booklet.dvi: $(REFCARD).tex $(LOGO).eps
 	if [ "$(PAPERTYPE)" == a4 ]; then \
 	  TEXINPUTS=$(srcdir):$$TEXINPUTS:: \
-          $(LATEX) '\def\booklettrue{}\input{$(REFCARD)}' && \
-	  mv $(REFCARD).dvi $@ ;\
+          $(LATEX) '\def\booklettrue{}\input{$(REFCARD)}' ;\
 	else \
 	  TEXINPUTS=$(srcdir):$$TEXINPUTS:: \
-          $(LATEX) '\def\booklettrue{}\def\letterpapertrue{}\input{$(REFCARD)}' && \
-	  mv $(REFCARD).dvi $@ ;\
+          $(LATEX) '\def\booklettrue{}\def\letterpapertrue{}\input{$(REFCARD)}' ;\
 	fi
+	mv $(REFCARD).dvi $@
 
 gnus-booklet.pdf: $(REFCARD).tex  $(LOGO).pdf
 	if [ "$(PAPERTYPE)" == a4 ]; then \
 	  TEXINPUTS=$(srcdir):$$TEXINPUTS:: \
-          $(PDFLATEX) '\def\booklettrue{}\input{$(REFCARD)}' && \
-	  mv -v $(REFCARD).pdf $@ ;\
+          $(PDFLATEX) '\def\booklettrue{}\input{$(REFCARD)}' ;\
 	else \
 	  TEXINPUTS=$(srcdir):$$TEXINPUTS:: \
-          $(PDFLATEX) '\def\booklettrue{}\def\letterpapertrue{}\input{$(REFCARD)}' && \
-	  mv -v $(REFCARD).pdf $@ ;\
+          $(PDFLATEX) '\def\booklettrue{}\def\letterpapertrue{}\input{$(REFCARD)}' ;\
 	fi
+	mv $(REFCARD).pdf $@ 
 
-gnus-faq-full-update:  gnus-faq-clean gnus-faq.texi
+gnus-faq-full-update:  gnus-faq-clean gnus-faq-texi
 
 gnus-faq.xml:
 	cvs -z3 -d:pserver:anonymous@cvs.sourceforge.net:/cvsroot/gnus \
@@ -145,7 +143,7 @@ gnus-faq.xml:
 	  { echo "Update of $@ failed."; : rm $@.tmp; exit 1; }
 	mv $@.tmp $@
 
-gnus-faq.texi: gnus-faq.xml xml2texi.sh xml2texi.scm
+gnus-faq-texi: gnus-faq.xml xml2texi.sh xml2texi.scm
 	./xml2texi.sh $< $@.tmp
 	@echo
 # FIXME: This should be done in xml2texi.scm or gnus-faq.xml should be