$NetBSD: patch-aa,v 1.7 2002/09/11 11:13:02 jlam Exp $

--- Makefile.in.orig	Fri Feb  1 23:57:38 2002
+++ Makefile.in
@@ -18,10 +18,7 @@ bindir = @bindir@
 mandir = @mandir@
 man6dir = $(mandir)/man6
 man6ext = .6
-# Yuck; the autoconf generated configure script sets an infodir variable
-# and provides a command-line flag to change it, but the default is 
-# /usr/info instead of /usr/share/info.
-infodir = $(prefix)/share/info
+infodir = @infodir@
 
 CC = @CC@
 CFLAGS = @CFLAGS@ @CPPFLAGS@ -DINFODIR=\"$(infodir)\"
@@ -67,16 +64,15 @@ more: all pseudo-source info FAQ html dv
 
 install: installdirs xboard zic2xpm cmail pxboard xboard.man cmail.man \
 		zic2xpm.man
-	$(INSTALL_PROGRAM) -s xboard $(bindir)/xboard
-	$(INSTALL_PROGRAM) -s zic2xpm $(bindir)/zic2xpm
-	$(INSTALL_PROGRAM) cmail $(bindir)/cmail
-	$(INSTALL_PROGRAM) $(srcdir)/pxboard $(bindir)/pxboard
-	$(INSTALL_DATA) $(srcdir)/xboard.man $(man6dir)/xboard$(man6ext)
-	$(INSTALL_DATA) $(srcdir)/cmail.man $(man6dir)/cmail$(man6ext)
-	$(INSTALL_DATA) $(srcdir)/zic2xpm.man $(man6dir)/zic2xpm$(man6ext)
-	$(INSTALL_DATA) xboard.info $(infodir)/xboard.info
-	-PATH=$$PATH:/sbin:/usr/sbin install-info \
-		$(infodir)/xboard.info $(infodir)/dir
+	$(BSD_INSTALL_PROGRAM) xboard $(bindir)/xboard
+	$(BSD_INSTALL_PROGRAM) zic2xpm $(bindir)/zic2xpm
+	$(BSD_INSTALL_SCRIPT) cmail $(bindir)/cmail
+	$(BSD_INSTALL_SCRIPT) $(srcdir)/pxboard $(bindir)/pxboard
+	$(BSD_INSTALL_MAN) $(srcdir)/xboard.man $(man6dir)/xboard$(man6ext)
+	$(BSD_INSTALL_MAN) $(srcdir)/cmail.man $(man6dir)/cmail$(man6ext)
+	$(BSD_INSTALL_MAN) $(srcdir)/zic2xpm.man $(man6dir)/zic2xpm$(man6ext)
+	$(BSD_INSTALL_DATA) xboard.info $(infodir)/xboard.info
+	$(INSTALL_INFO) $(infodir)/xboard.info $(infodir)/dir
 
 installdirs: mkinstalldirs
 	$(srcdir)/mkinstalldirs $(bindir) $(mandir) $(man6dir) $(infodir)