===================================================================
RCS file: /home/cvs/OpenXM/src/asir-doc/extract_func.c,v
retrieving revision 1.6
retrieving revision 1.8
diff -u -p -r1.6 -r1.8
--- OpenXM/src/asir-doc/extract_func.c	2009/02/22 20:27:25	1.6
+++ OpenXM/src/asir-doc/extract_func.c	2020/09/05 00:57:16	1.8
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM/src/asir-doc/extract_func.c,v 1.5 2009/02/22 17:59:25 ohara Exp $ */
+/* $OpenXM: OpenXM/src/asir-doc/extract_func.c,v 1.7 2016/08/29 04:56:58 noro Exp $ */
 
 #include <stdio.h>
 #include <string.h>
@@ -73,8 +73,8 @@ char **argv;
 				if ( buf1[0] == 0x1f ) {
 					fclose(fp); fp = 0;
 					if ( jis ) {
-						sprintf(cmd,"nkf %s > %s.tmp; rm -f %s; mv %s.tmp %s",
-							name[0],name[0],name[0]);
+						sprintf(cmd,"nkf -w %s > %s.tmp; rm -f %s; mv %s.tmp %s",
+							name[0],name[0],name[0],name[0]);
 						system(cmd);
 					}
 				} else
@@ -84,7 +84,7 @@ char **argv;
 			if ( buf[0] == 0x1f ) {
 				fclose(fp); fp = 0;
 				if ( jis ) {
-					sprintf(cmd,"nkf %s > %s.tmp; rm -f %s; mv %s.tmp %s",
+					sprintf(cmd,"nkf -w %s > %s.tmp; rm -f %s; mv %s.tmp %s",
 						fn,fn,fn,fn,fn);
 					system(cmd);
 				}
@@ -126,10 +126,12 @@ char **name;
 	}
 	i = 0;
 	while ( 1 ) {
-		/* search a back quote */
+    /* makeinfo v5 outputs 'fname', while makeinfo v4 output `fname' */
+		/* search a (back) quote */
 		bquote = strchr(buf,'`' );
 		if ( !bquote )
-			return 0;
+      bquote = strchr(buf,'\'');
+      if ( !bquote ) return 0;
 		buf = bquote+1;
 
 		/* buf points to a function; search a quote */