--- Makefile.in.orig	2006-05-04 00:03:28.000000000 -0400
+++ Makefile.in	2006-05-04 00:14:10.000000000 -0400
@@ -21,7 +21,7 @@
 # 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 = /usr/share/info
 
 CC = @CC@
 CFLAGS = @CFLAGS@ @CPPFLAGS@ -DINFODIR=\"$(infodir)\"
@@ -63,18 +63,16 @@
 all: default pseudosource info FAQ html dvi ps
 
 install: installdirs default
-	$(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)/zic2xpm.man $(man6dir)/zic2xpm$(man6ext)
-	$(INSTALL_DATA) xboard.info $(infodir)/xboard.info
-	-PATH=$$PATH:/sbin:/usr/sbin install-info \
-		$(infodir)/xboard.info $(infodir)/dir
+	$(INSTALL_PROGRAM) xboard $(DESTDIR)$(bindir)/xboard
+	$(INSTALL_PROGRAM) zic2xpm $(DESTDIR)$(bindir)/zic2xpm
+	$(INSTALL_PROGRAM) cmail $(DESTDIR)$(bindir)/cmail
+	$(INSTALL_PROGRAM) $(srcdir)/pxboard $(DESTDIR)$(bindir)/pxboard
+	$(INSTALL_DATA) $(srcdir)/xboard.man $(DESTDIR)$(man6dir)/xboard$(man6ext)
+	$(INSTALL_DATA) $(srcdir)/zic2xpm.man $(DESTDIR)$(man6dir)/zic2xpm$(man6ext)
+	$(INSTALL_DATA) xboard.info $(DESTDIR)$(infodir)/xboard.info
 
 installdirs: mkinstalldirs
-	$(srcdir)/mkinstalldirs $(bindir) $(mandir) $(man6dir) $(infodir)
+	$(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(mandir) $(DESTDIR)$(man6dir) $(DESTDIR)$(infodir)
 
 uninstall:
 	rm -f $(bindir)/xboard $(bindir)/cmail $(bindir)/pxboard