* lisp/dgnushack.el (dgnushack-texi-format): A workaround for @ifnottex.

* texi/Makefile.in (.texi, %.info): Don't use makeinfo command when
 gnus-ja.texi or message-ja.texi is given.  It is needed for some make command
 if which can not understand "%-ja:" or "%-ja.info:".
(.texi, %.info, %-ja.info, %-ja): Don't eval `EMACSINFOHACK'.
(EMACSINFOHACK): Move to lisp/dgnushack.el.

diff --git a/ChangeLog b/ChangeLog
index 201804b..8b07427 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2001-02-01  Katsumi Yamaoka <yamaoka@jpl.org>
+
+       * lisp/dgnushack.el (dgnushack-texi-format): A workaround for
+       @ifnottex.
+
+       * texi/Makefile.in (.texi, %.info): Don't use makeinfo command when
+       gnus-ja.texi or message-ja.texi is given.  It is needed for some
+       make command if which can not understand "%-ja:" or "%-ja.info:".
+       (.texi, %.info, %-ja.info, %-ja): Don't eval `EMACSINFOHACK'.
+       (EMACSINFOHACK): Move to lisp/dgnushack.el.
+
 2001-01-29  Katsumi Yamaoka <yamaoka@jpl.org>
 
        * lisp/gnus-art.el (gnus-article-mime-edit-exit): Use

diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el
index 3829f3a..9b7239b 100644 (file)
--- a/lisp/dgnushack.el
+++ b/lisp/dgnushack.el
@@ -397,6 +397,10 @@ Modify to suit your needs."))
                                   (1+ (match-end 0))
                                 (point-max))))
              (goto-char (point-min))
+             ;; formerly EMACSINFOHACK in texi/Makefile.
+             (while (re-search-forward "@\\(end \\)?ifnottex\n*" nil t)
+               (replace-match ""))
+             (goto-char (point-min))
              ;; Add suffix if it is needed.
              (when (and addsuffix
                         (re-search-forward

diff --git a/texi/Makefile.in b/texi/Makefile.in
index 3d447b3..770a86d 100644 (file)
--- a/texi/Makefile.in
+++ b/texi/Makefile.in
@@ -13,7 +13,6 @@ 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 +41,29 @@ message-ja.info: message-ja.texi
 most: texi2latex.elc latex latexps
 
 %-ja: %-ja.texi
-       cd ../lisp && $(EMACSINFO) -eval '(find-file "$<")' \
-         $(EMACSINFOHACK) $(INFOSWI) ../texi/$<; \
+       cd ../lisp && $(EMACSINFO) $(INFOSWI) ../texi/$<
 
 %-ja.info: %-ja.texi
-       cd ../lisp && $(EMACSINFO) -eval '(find-file "$<")' \
-         $(EMACSINFOHACK)  $(XINFOSWI) ../texi/$<; \
+       cd ../lisp && $(EMACSINFO) $(XINFOSWI) ../texi/$<
 
 %.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 \
+         cd ../lisp && $(EMACSINFO) $(XINFOSWI) ../texi/$<; \
        else \
-         makeinfo -o $@ $<; \
+         $(MAKEINFO) -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 \
+         cd ../lisp && $(EMACSINFO) $(INFOSWI) ../texi/$<; \
        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