X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;ds=inline;f=texi%2FMakefile.in;h=8b5a002628d5162006784d735899885529e1294b;hb=34bf6c22bda9715327a00ce9bd1cd7909a93be41;hp=5a996143956729b7fe54a8a990788e9338b3c0f9;hpb=3c7ebb5757218763ad5f2d74d5001681f578adbe;p=gnus

diff --git a/texi/Makefile.in b/texi/Makefile.in
index 5a9961439..8b5a00262 100644
--- a/texi/Makefile.in
+++ b/texi/Makefile.in
@@ -8,13 +8,14 @@ VPATH=$(srcdir)
 TEXI2DVI=texi2dvi
 TEXI2PDF=texi2pdf
 MAKEINFO=@MAKEINFO@
+EMACS=@EMACS@
 EMACSINFO=$(EMACS) -batch -q -no-site-file
 INFOSWI=-l texinfmt -f texinfo-every-node-update -f texinfo-format-buffer -f save-buffer
 XINFOSWI=-l texinfmt -f texinfo-every-node-update -f texinfo-format-buffer -f save-buffer
+EMACSINFOHACK=-eval '(while (re-search-forward "@\\(end \\)?ifnottex" nil t) (replace-match ""))'
 PDFLATEX=pdflatex
 LATEX=latex
 DVIPS=dvips
-PERL=perl
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 SHELL = /bin/sh
@@ -27,10 +28,10 @@ most: texi2latex.elc latex latexps
 .SUFFIXES: .texi .dvi .ps .pdf
 
 .texi:
-	if test -x $(MAKEINFO); then \
+	if test "x$(MAKEINFO)" != "xno" ; then \
 	  makeinfo -o $* $<; \
 	else \
-	  $(EMACSINFO) -eval '(find-file "$<")' $(XINFOSWI); \
+	  $(EMACSINFO) -eval '(find-file "$<")' $(EMACSINFOHACK) $(XINFOSWI); \
 	fi
 
 dvi: gnus.dvi message.dvi refcard.dvi emacs-mime.dvi
@@ -38,13 +39,13 @@ dvi: gnus.dvi message.dvi refcard.dvi emacs-mime.dvi
 pdf: gnus.pdf message.pdf refcard.pdf emacs-mime.pdf
  
 .texi.dvi :
-	$(PERL) -n -e 'print unless (/\@iflatex/ .. /\@end iflatex/)' $< > gnustmp.texi
+	sed -e '/@iflatex/,/@end iflatex/d' $< > gnustmp.texi 
 	$(TEXI2DVI) gnustmp.texi
 	cp gnustmp.dvi $*.dvi
 	rm gnustmp.*
 
 .texi.pdf :
-	$(PERL) -n -e 'print unless (/\@iflatex/ .. /\@end iflatex/)' $< > gnustmp.texi
+	sed -e '/@iflatex/,/@end iflatex/d' $< > gnustmp.texi 
 	$(TEXI2PDF) gnustmp.texi
 	cp gnustmp.pdf $*.pdf
 	rm gnustmp.*
@@ -59,9 +60,9 @@ refcard.pdf: refcard.tex gnuslogo.refcard gnusref.tex
 
 clean:
 	rm -f gnus.*.bak *.ky *.cp *.fn *.cps *.kys *.log *.aux *.dvi *.vr \
-	*.tp *.toc *.pg gnus.latexi *.aux *.[cgk]idx \
+	*.pdf *.tp *.toc *.pg gnus.latexi *.aux *.[cgk]idx \
 	gnus.ilg gnus.ind gnus.[cgk]ind gnus.idx \
-	gnus.tmptexi *.tmplatexi gnus.tmplatexi1 texput.log *.orig *.rej \
+	gnustmp.texi *.tmplatexi gnus.tmplatexi1 texput.log *.orig *.rej \
 	gnus.latexi*~* tmp/*.ps xface.tex picons.tex smiley.tex *.latexi
 
 makeinfo:
@@ -69,10 +70,10 @@ makeinfo:
 	makeinfo -o message message.texi
 
 texi2latex.elc: texi2latex.el
-	$(EMACS) -batch -l bytecomp --eval '(byte-compile-file "texi2latex.el")'
+	$(EMACSINFO) -batch -l bytecomp --eval '(byte-compile-file "texi2latex.el")'
 
 latex: gnus.texi texi2latex.elc
-	$(EMACS) -batch -q -no-site-file gnus.texi -l ./texi2latex.elc -f latexi-translate
+	$(EMACSINFO) -batch -q -no-site-file gnus.texi -l ./texi2latex.elc -f latexi-translate
 
 latexps:
 	make texi2latex.elc