From 7b70000988a60df61eab228a674d6653f9b682b7 Mon Sep 17 00:00:00 2001 From: H.G. Muller Date: Sat, 7 Jan 2012 20:19:09 +0100 Subject: [PATCH] Install icons directly Rather than letting make-install copy the pixmaps to the XBoard data directory they are installed directly from the source files. The name of the TRN icon was also corrected and changed. --- Makefile.am | 19 ++++++++----------- xboard.xml | 2 +- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/Makefile.am b/Makefile.am index 73887eb..d95135d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -147,10 +147,7 @@ dist_bitmaps_DATA = \ ### directory and files for pixmaps pixmapsdir = $(datadir)/games/xboard/pixmaps/textures -dist_pixmaps_DATA = pixmaps/wood_d.xpm pixmaps/wood_l.xpm \ - pixmaps/cross32.xpm pixmaps/cross48.xpm \ - pixmaps/board32.xpm pixmaps/board48.xpm - +dist_pixmaps_DATA = pixmaps/wood_d.xpm pixmaps/wood_l.xpm ### directory and files for sound files @@ -187,10 +184,10 @@ install-mime-database: xdg-desktop-menu install --mode system --novendor $(Applicationsdir)/xboard-pgn-viewer.desktop;\ xdg-desktop-menu install --mode system --novendor $(Applicationsdir)/xboard-fen-viewer.desktop;\ xdg-desktop-menu install --mode system --novendor $(Applicationsdir)/xboard-tourney.desktop;\ - xdg-icon-resource install --context mimetypes --size 32 $(pixmapsdir)/board32.xpm application-x-chess-pgn;\ - xdg-icon-resource install --context mimetypes --size 32 $(pixmapsdir)/cross32.xpm x-xboard-pgn;\ - xdg-icon-resource install --context mimetypes --size 48 $(pixmapsdir)/board48.xpm application-x-chess-pgn;\ - xdg-icon-resource install --context mimetypes --size 48 $(pixmapsdir)/cross48.xpm x-xboard-pgn;\ + xdg-icon-resource install --context mimetypes --size 32 pixmaps/board32.xpm application-x-chess-pgn;\ + xdg-icon-resource install --context mimetypes --size 32 pixmaps/cross32.xpm application-x-xboard-trn;\ + xdg-icon-resource install --context mimetypes --size 48 pixmaps/board48.xpm application-x-chess-pgn;\ + xdg-icon-resource install --context mimetypes --size 48 pixmaps/cross48.xpm application-x-xboard-trn;\ fi uninstall-mime-database: @-if test -z "$(DESTDIR)"; then \ @@ -199,7 +196,7 @@ uninstall-mime-database: xdg-desktop-menu uninstall --mode system --novendor xboard-fen-viewer.desktop;\ xdg-desktop-menu uninstall --mode system --novendor xboard-tourney.desktop;\ xdg-icon-resource uninstall --context mimetypes --size 32 board32.xpm application-x-chess-pgn;\ - xdg-icon-resource uninstall --context mimetypes --size 32 cross32.xpm x-xboard-pgn;\ + xdg-icon-resource uninstall --context mimetypes --size 32 cross32.xpm application-x-xboard-trn;\ xdg-icon-resource uninstall --context mimetypes --size 48 board48.xpm application-x-chess-pgn;\ - xdg-icon-resource uninstall --context mimetypes --size 48 cross48.xpm x-xboard-pgn;\ - fi \ No newline at end of file + xdg-icon-resource uninstall --context mimetypes --size 48 cross48.xpm application-x-xboard-trn;\ + fi diff --git a/xboard.xml b/xboard.xml index dc52bfa..c8be679 100644 --- a/xboard.xml +++ b/xboard.xml @@ -51,7 +51,7 @@ XBoard tournament - + -- 1.7.0.4