>Number:         7439
>Category:       bin
>Synopsis:       am-utils.info is not installed.
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    bin-bug-people (Utility Bug People)
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Wed Apr 21 20:35:00 1999
>Last-Modified:
>Originator:     Minoura Makoto
>Organization:
Minoura Makoto
<minoura@flab.fujitsu.co.jp> / <minoura@netbsd.org>
>Release:        1.4_ALPHA
>Environment:
System: NetBSD ecology 1.4_ALPHA NetBSD 1.4_ALPHA (ECOLOGY) #16: Thu Apr 15 19:58:49 JST 1999 root@ecology:/usr/obj/sys/arch/sparc/compile/ECOLOGY sparc


>Description:
	Now that we have texinfo tools and /usr/share/info,
	am-utils.info should be installed.
>How-To-Repeat:
	
>Fix:
	Re-import with the patched amd2netbsd.
	*.info in the original archive are not imported.  Unsplitted
	version is generated in the `make' process.
	RCS ID of doc/* files was not correctly inserted.  The patch
	also fixes them.

--- /usr/src/usr.sbin/amd/amd2netbsd	Wed Mar  3 05:04:20 1999
+++ usr.sbin/amd/amd2netbsd	Thu Apr 22 11:17:38 1999
@@ -118,10 +118,7 @@
 @wiretestef = ();
 
 
-@docf = ("am-utils.info", "am-utils.info-1", "am-utils.info-2",
-	 "am-utils.info-3", "am-utils.info-4", "am-utils.info-5",
-	 "am-utils.info-6", "am-utils.texi", "hlfsd.ps", "texinfo.tex",
-	 "version.texi");
+@docf = ("am-utils.texi", "hlfsd.ps", "texinfo.tex", "version.texi");
 
 @docdf = ();
 
@@ -156,6 +153,18 @@
     elsif ($t =~ /.*\.[yl]/) {
 	$hdr = 1;
     }
+    elsif ($t =~ /am-utils\.texi/) {
+	$hdr = 2;
+    }
+    elsif ($t =~ /.*\.texi/) {
+	print OFILE '@c', "\t", '$', 'NetBSD', '$', "\n";
+    }
+    elsif ($t =~ /.*\.tex$/) {
+	print OFILE "%\t", '$', 'NetBSD', '$', "\n";
+    }
+    elsif ($t =~ /.*\.ps/) {
+	$hdr = 3;
+    }
     else {
 	print OFILE '$', 'NetBSD', '$', "\n";
     }
@@ -167,6 +176,21 @@
 		next;
 	    }
 	}
+	elsif ($hdr == 2) {
+	    if (/\\input[ \t]+texinfo/) {
+		print OFILE $_;
+		print OFILE '@c', "\t", '$', 'NetBSD', '$', "\n";
+		$hdr = 0;
+		next;
+	    }
+	}
+	elsif ($hdr == 3) {
+	    # First line is magic.  Insert Id between lines 1 and 2.
+	    print OFILE $_;
+	    print OFILE "%\t", '$', 'NetBSD', '$', "\n";
+	    $hdr = 0;
+	    next;
+	}
 	if ($state == 2) {
 	    if (/#endif/) {
 		print OFILE "#else\n__RCSID(", '"$', 'NetBSD', '$"',
@@ -398,7 +422,7 @@
 __END__
 %% file usr.sbin/amd/Makefile
 %% NetBSD #
-SUBDIR= libamu amd amq hlfsd fixmount fsinfo mk-amd-map pawd wire-test
+SUBDIR= libamu amd amq hlfsd fixmount fsinfo mk-amd-map pawd wire-test doc
 
 all-amd all-amq all-hlfsd all-fixmount all-fsinfo all-mk-amd-map all-pawd \
     all-wire-test: all-libamu
@@ -560,19 +584,10 @@
 %% file usr.sbin/amd/doc/Makefile
 %% NetBSD #
 
-PROG = am-utils
-SRCS = am-utils.texinfo
-
-${PROG}: am-utils.dvi
-
-am-utils.dvi: ${SRCS}
-	-tex am-utils.texinfo; tex am-utils.texinfo
+TEXINFO = am-utils.info
+INFOFLAGS = -I${.CURDIR}
 
-clean:
-	-rm -f am-utils.aux am-utils.cp am-utils.cps am-utils.dvi am-utils.fn \
-	 am-utils.fns am-utils.ky am-utils.kys am-utils.log am-utils.pg \
-	 am-utils.pgs am-utils.toc am-utils.tp am-utils.tps am-utils.vr \
-	 am-utils.vrs
+.include <bsd.info.mk>
 %% file usr.sbin/amd/include/config.h
 /* config.h.  Generated automatically by configure.  */
 /* aux/config.h.in.  Generated automatically from ./aux/configure.in by autoheader.  */
>Audit-Trail:
>Unformatted: