Author: "P. J. McDermott" Subject: Add "$(DESTDIR)" to install-data-local diff -Naur src.orig/Makefile.am src/Makefile.am --- src.orig/Makefile.am 2002-03-31 20:17:17.000000000 -0500 +++ src/Makefile.am 2014-07-25 22:50:05.738501620 -0400 @@ -10,29 +10,29 @@ 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; \ + $(INSTALL_DATA) $(srcdir)/matrix.fnt $(DESTDIR)/usr/share/consolefonts; \ + $(INSTALL_DATA) $(srcdir)/matrix.psf.gz $(DESTDIR)/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; \ + $(INSTALL_DATA) $(srcdir)/matrix.fnt $(DESTDIR)/usr/lib/kbd/consolefonts; \ + $(INSTALL_DATA) $(srcdir)/matrix.psf.gz $(DESTDIR)/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; \ + $(INSTALL_DATA) $(srcdir)/mtx.pcf $(DESTDIR)/usr/lib/X11/fonts/misc; \ + $(INSTALL_DATA) $(srcdir)/mtx.pcf $(DESTDIR)/usr/lib/X11/fonts/misc; \ echo " Running mkfontdir /usr/lib/X11/fonts/misc..."; \ - $(MKFONTDIR) /usr/lib/X11/fonts/misc; \ + $(MKFONTDIR) $(DESTDIR)/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; \ + $(INSTALL_DATA) $(srcdir)/mtx.pcf $(DESTDIR)/usr/X11R6/lib/X11/fonts/misc; \ + $(INSTALL_DATA) $(srcdir)/mtx.pcf $(DESTDIR)/usr/X11R6/lib/X11/fonts/misc; \ echo " Running mkfontdir /usr/X11R6/lib/X11/fonts/misc..."; \ - $(MKFONTDIR) /usr/X11R6/lib/X11/fonts/misc; \ + $(MKFONTDIR) $(DESTDIR)/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 \ diff -Naur src.orig/Makefile.in src/Makefile.in --- src.orig/Makefile.in 2002-03-31 21:11:59.000000000 -0500 +++ src/Makefile.in 2014-07-25 22:50:21.582980395 -0400 @@ -405,29 +405,29 @@ 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; \ + $(INSTALL_DATA) $(srcdir)/matrix.fnt $(DESTDIR)/usr/share/consolefonts; \ + $(INSTALL_DATA) $(srcdir)/matrix.psf.gz $(DESTDIR)/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; \ + $(INSTALL_DATA) $(srcdir)/matrix.fnt $(DESTDIR)/usr/lib/kbd/consolefonts; \ + $(INSTALL_DATA) $(srcdir)/matrix.psf.gz $(DESTDIR)/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; \ + $(INSTALL_DATA) $(srcdir)/mtx.pcf $(DESTDIR)/usr/lib/X11/fonts/misc; \ + $(INSTALL_DATA) $(srcdir)/mtx.pcf $(DESTDIR)/usr/lib/X11/fonts/misc; \ echo " Running mkfontdir /usr/lib/X11/fonts/misc..."; \ - $(MKFONTDIR) /usr/lib/X11/fonts/misc; \ + $(MKFONTDIR) $(DESTDIR)/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; \ + $(INSTALL_DATA) $(srcdir)/mtx.pcf $(DESTDIR)/usr/X11R6/lib/X11/fonts/misc; \ + $(INSTALL_DATA) $(srcdir)/mtx.pcf $(DESTDIR)/usr/X11R6/lib/X11/fonts/misc; \ echo " Running mkfontdir /usr/X11R6/lib/X11/fonts/misc..."; \ - $(MKFONTDIR) /usr/X11R6/lib/X11/fonts/misc; \ + $(MKFONTDIR) $(DESTDIR)/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 \