o Fix checksum dependency to emacs20.

   o Change port's texinfo format procedure more verbose one.  This also
     fixes the build problem on 4-current.

PR:		16357
Submitted by:	maintainer

2 files changed, 20 insertions, 8 deletions

diff --git a/japanese/emacs-manual/files/Makefile.in b/japanese/emacs-manual/files/Makefile.in
index f8fd7393b50a..ae123a322465 100644
--- a/japanese/emacs-manual/files/Makefile.in
+++ b/japanese/emacs-manual/files/Makefile.in
@@ -2,19 +2,15 @@ TEXIFILE= emacs.texi
 INFOFILE= ../info/emacs-ja
 
 EMACS?=	emacs
-FORMAT_FLAG?= t
 
 EMACS_ARGS= -batch -nw --multibyte -no-init-file -no-site-file
-EMACS_LOADLIBS= --load=texinfmt.el
-EMACS_FUNCALLS=	--eval "(texinfo-format-buffer ${FORMAT_FLAG})" -f save-buffer
+EMACS_LOADLIBS= --load=texinfmt.el --load=PORT_TEXIFMT.MK
+EMACS_FUNCALLS= --eval "(defconst PORT-TEXI \"${TEXIFILE}\")" -f port-texinfo-format
 
 all: ${INFOFILE}
 
-MAKEINFO-BY-EMACS: .USE
-	${EMACS} ${EMACS_ARGS} ${EMACS_LOADLIBS} ${.ALLSRC} ${EMACS_FUNCALLS} \
-		> /dev/null 2>&1
-
-${INFOFILE}: ${TEXIFILE} MAKEINFO-BY-EMACS
+${INFOFILE}: ${TEXIFILE}
+	${EMACS} ${EMACS_ARGS} ${EMACS_LOADLIBS} ${EMACS_FUNCALLS}
 
 install: all
 	${BSD_INSTALL_DATA} ${INFOFILE} ${PREFIX}/info
diff --git a/japanese/emacs-manual/files/PORT_TEXIFMT.MK b/japanese/emacs-manual/files/PORT_TEXIFMT.MK
new file mode 100644
index 000000000000..9443db0cbd56
--- /dev/null
+++ b/japanese/emacs-manual/files/PORT_TEXIFMT.MK
@@ -0,0 +1,16 @@
+;;; -*- Emacs-Lisp -*-
+;;; PORT_TEXIFMT.MK --- for texinfo-format
+;;; Code:
+
+(defun port-texinfo-format ()
+  (let (obuf)
+    (find-file (expand-file-name PORT-TEXI))
+    (setq obuf (current-buffer))
+    (require 'texinfmt)
+    (texinfo-format-buffer t)
+    (set-buffer-file-coding-system 'iso-2022-jp)
+    (save-buffer)
+    (kill-buffer (current-buffer))
+    (kill-buffer obuf)))
+
+;;; PORT_TEXIFMT.MK ends here