diff -Nru cmatrix-1.1b/Makefile.am cmatrix-1.1b.new/Makefile.am
--- cmatrix-1.1b/Makefile.am	Mon Apr 10 05:58:41 2000
+++ cmatrix-1.1b.new/Makefile.am	Mon Apr 10 06:00:33 2000
@@ -7,33 +7,8 @@
 		TODO install-sh missing mkinstalldirs matrix.fnt \
 		matrix.psf.gz mtx.pcf
 
-install-data-local:
-	@if test -d /usr/share/consolefonts; then \
-	    echo " Installing matrix fonts in /usr/share/consolefonts..."; \
-	    $(INSTALL_DATA) $(srcdir)/matrix.fnt /usr/share/consolefonts; \
-	    $(INSTALL_DATA) $(srcdir)/matrix.psf.gz /usr/share/consolefonts; \
-	fi
-	@if test -d /usr/lib/kbd/consolefonts; then \
-	    echo " Installing matrix fonts in /usr/lib/kbd/consolefonts..."; \
-	    $(INSTALL_DATA) $(srcdir)/matrix.fnt /usr/lib/kbd/consolefonts; \
-	    $(INSTALL_DATA) $(srcdir)/matrix.psf.gz /usr/lib/kbd/consolefonts; \
-	fi
-	@if test -d /usr/lib/X11/fonts/misc; then \
-	    echo " Installing X window matrix fonts in /usr/lib/X11/fonts/misc..."; \
-	    $(INSTALL_DATA) $(srcdir)/mtx.pcf /usr/lib/X11/fonts/misc; \
-	    $(INSTALL_DATA) $(srcdir)/mtx.pcf /usr/lib/X11/fonts/misc; \
-	    echo " Running mkfontdir /usr/lib/X11/fonts/misc..."; \
-	    $(MKFONTDIR) /usr/lib/X11/fonts/misc; \
-	    echo " Done.  If this is the first time you have installed CMatrix you will"; \
-	    echo " probably have to restart X window in order to use the mtx.pcf font."; \
-	else \
-	if test -d /usr/X11R6/lib/X11/fonts/misc; then \
-	    echo " Installing X window matrix fonts in /usr/X11R6/lib/X11/fonts/misc..."; \
-	    $(INSTALL_DATA) $(srcdir)/mtx.pcf /usr/X11R6/lib/X11/fonts/misc; \
-	    $(INSTALL_DATA) $(srcdir)/mtx.pcf /usr/X11R6/lib/X11/fonts/misc; \
-	    echo " Running mkfontdir /usr/X11R6/lib/X11/fonts/misc..."; \
-	    $(MKFONTDIR) /usr/X11R6/lib/X11/fonts/misc; \
-	    echo " Done.  If this is the first time you have installed CMatrix you will"; \
-	    echo " probably have to restart X window in order to use the mtx.pcf font."; \
-	fi \
-	fi
+consolefonts_DATA = matrix.fnt matrix.psf.gz
+consolefontsdir = /usr/share/consolefonts
+
+Xmiscfonts_DATA = mtx.pcf
+Xmiscfontsdir=/usr/X11R6/lib/X11/fonts/misc