Synch with Oort Gnus.

[elisp/gnus.git-] / texi / Makefile.in

diff --git a/texi/Makefile.in b/texi/Makefile.in
index 3d447b3..f5f2004 100644 (file)
--- a/texi/Makefile.in
+++ b/texi/Makefile.in
@@ -1,5 +1,5 @@
-prefix = @prefix@
 infodir = @infodir@
+prefix = @prefix@
 srcdir = @srcdir@
 subdir = texi
 top_srcdir = @top_srcdir@
@@ -11,9 +11,6 @@ TEXI2PDF=texi2pdf
 MAKEINFO=@MAKEINFO@
 EMACS=@EMACS@
 EMACSINFO=$(EMACS) -batch -q -no-site-file
-INFOSWI=-l ./dgnushack.el -f dgnushack-texi-format
-XINFOSWI=-l ./dgnushack.el -f dgnushack-texi-add-suffix-and-format
-EMACSINFOHACK=-eval '(while (re-search-forward "@\\(end \\)?ifnottex" nil t) (replace-match ""))'
 PDFLATEX=pdflatex
 LATEX=latex
 DVIPS=dvips
@@ -42,29 +39,33 @@ message-ja.info: message-ja.texi
 most: texi2latex.elc latex latexps
 
 %-ja: %-ja.texi
-       cd ../lisp && $(EMACSINFO) -eval '(find-file "$<")' \
-         $(EMACSINFOHACK) $(INFOSWI) ../texi/$<; \
+       $(EMACSINFO) -l $(srcdir)/infohack.el \
+               -eval '(infohack-texi-format "$<")'
 
 %-ja.info: %-ja.texi
-       cd ../lisp && $(EMACSINFO) -eval '(find-file "$<")' \
-         $(EMACSINFOHACK)  $(XINFOSWI) ../texi/$<; \
+       $(EMACSINFO) -l $(srcdir)/infohack.el \
+               -eval '(infohack-texi-format "$<" t)'
 
 %.info: %.texi
-       if test $(MAKEINFO) = no; then \
-         cd ../lisp && $(EMACSINFO) -eval '(find-file "$<")' \
-           $(EMACSINFOHACK)  $(XINFOSWI) ../texi/$<; \
+       if test "x$(MAKEINFO)" = "xno" \
+         -o "$<" = "gnus-ja.texi" \
+         -o "$<" = "message-ja.texi"; then \
+         $(EMACSINFO) -l $(srcdir)/infohack.el \
+               -eval '(infohack-texi-format "$<" t)'; \
        else \
-         makeinfo -o $@ $<; \
+         $(MAKEINFO) -I $(srcdir) -o $@ $<; \
        fi
 
 .SUFFIXES: .texi .dvi .ps .pdf
 
 .texi:
-       if test "x$(MAKEINFO)" != "xno" ; then \
-         makeinfo -I $(srcdir) -o $* $<; \
+       if test "x$(MAKEINFO)" = "xno" \
+         -o "$<" = "gnus-ja.texi" \
+         -o "$<" = "message-ja.texi"; then \
+         $(EMACSINFO) -l $(srcdir)/infohack.el \
+               -eval '(infohack-texi-format "$<")'; \
        else \
-         cd ../lisp && $(EMACSINFO) -eval '(find-file "$<")' \
-           $(EMACSINFOHACK) $(INFOSWI) ../texi/$<; \
+         $(MAKEINFO) -I $(srcdir) -o $* $<; \
        fi
 
 dvi: gnus.dvi message.dvi refcard.dvi emacs-mime.dvi
@@ -73,23 +74,23 @@ pdf: gnus.pdf message.pdf refcard.pdf emacs-mime.pdf
 
 .texi.dvi :
        sed -e '/@iflatex/,/@end iflatex/d' $< > gnustmp.texi
-       $(TEXI2DVI) gnustmp.texi
+       $(TEXI2DVI) -I $(srcdir) gnustmp.texi
        cp gnustmp.dvi $*.dvi
        rm gnustmp.*
 
 .texi.pdf :
        sed -e '/@iflatex/,/@end iflatex/d' $< > gnustmp.texi
-       $(TEXI2PDF) gnustmp.texi
+       $(TEXI2PDF) -I $(srcdir) gnustmp.texi
        cp gnustmp.pdf $*.pdf
        rm gnustmp.*
 
 refcard.dvi: refcard.tex gnuslogo.refcard gnusref.tex
-       $(LATEX) refcard.tex
+       TEXINPUTS=$(srcdir):$$TEXINPUTS $(LATEX) refcard.tex
 
 
 refcard.pdf: refcard.tex gnuslogo.refcard gnusref.tex
-       epstopdf gnuslogo.refcard --outfile=gnuslogo.refcard.pdf
-       $(PDFLATEX) refcard.tex
+       epstopdf $(srcdir)/gnuslogo.refcard --outfile=gnuslogo.refcard.pdf
+       TEXINPUTS=$(srcdir):$$TEXINPUTS $(PDFLATEX) refcard.tex
 
 clean:
        rm -f *.orig *.rej *.elc *~ gnus-[0-9] gnus-[0-9][0-9]
@@ -110,16 +111,16 @@ makeinfo:
        makeinfo -o message message.texi
 
 texi2latex.elc: texi2latex.el
-       $(EMACSINFO) -batch -l bytecomp --eval '(byte-compile-file "texi2latex.el")'
+       srcdir=$(srcdir)/../lisp $(EMACSINFO) -l $(srcdir)/../lisp/dgnushack.el --eval '(byte-compile-file "$(srcdir)/texi2latex.el")'
 
-latex: gnus.texi texi2latex.elc
-       $(EMACSINFO) -batch -q -no-site-file gnus.texi -l ./texi2latex.elc -f latexi-translate
+latex gnus.latexi gnus-faq.latexi: $(srcdir)/gnus.texi $(srcdir)/gnus-faq.texi texi2latex.elc
+       srcdir=$(srcdir) $(EMACSINFO) -l ./texi2latex.elc -f latexi-translate
 
-latexps:
+latexps: gnus.latexi
        $(MAKE) texi2latex.elc
        rm -f gnus.aux
        egrep -v "label.*Index|chapter.*Index" gnus.latexi > gnus.tmplatexi1
-       $(LATEX) gnus.tmplatexi1
+       TEXINPUTS=$(srcdir):$$TEXINPUTS $(LATEX) gnus.tmplatexi1
        ./splitindex
        makeindex -o gnus.kind gnus.kidx
        makeindex -o gnus.cind gnus.cidx
@@ -170,11 +171,10 @@ install: $(INFO_DEPS)
        $(SHELL) $(top_srcdir)/mkinstalldirs $(infodir)
        @list='$(INFO_DEPS)'; \
        for file in $$list; do \
-         d=$(srcdir); \
-         for ifile in `CDPATH=: && cd $$d && echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \
-           if test -f $$d/$$ifile; then \
-             echo " $(INSTALL_DATA) $$d/$$ifile $(infodir)/$$ifile"; \
-             $(INSTALL_DATA) $$d/$$ifile $(infodir)/$$ifile; \
+         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; \
            else : ; fi; \
          done; \
        done