X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=Makefile.am;h=88df0b93f43c8a0b57df76394c60368c47dbc833;hb=f4cc69edd466fda83f84629f40c086dd2a249616;hp=d47921774900200a17d9a40e560adf2fa1f5e0a7;hpb=37cca4fc922c993960db9f76037b3194d7605af6;p=xboard.git

diff --git a/Makefile.am b/Makefile.am
index d479217..88df0b9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,6 +35,7 @@ SUBDIRS = po
 xboard_LDADD = -lm @XAW_LIBS@ @X_LIBS@ @LIBINTL@
 EXTRA_DIST = pixmaps bitmaps sounds winboard filebrowser/README \
 	xboard.texi gpl.texinfo texi2man texinfo.tex xboard.man xboard.desktop \
+	xboard-fen-viewer.desktop  xboard-pgn-viewer.desktop  xboard-tourney.desktop xboard.xml \
 	COPYRIGHT FAQ.html engine-intf.html ics-parsing.txt readme.htm zippy.README \
 	xboard.conf.in SHORTLOG DIFFSTAT history.c ABOUT-NLS
 
@@ -67,12 +68,7 @@ dist_svgicon_DATA = xboard.svg
 ### desktop files for KDE and gnome
 
 Applicationsdir = $(datadir)/applications
-Applications_DATA = xboard.desktop xboard-fen-viewer.desktop \
-                    xboard-pgn-viewer.desktop xboard-tourney.desktop
-
-### mime definitions for association of fen, png and tourney files
-Mimedir = $(datadir)/mime/packages
-Mime_DATA = xboard.xml
+Applications_DATA = xboard.desktop
 
 ### directory and files for bitmaps
 
@@ -146,10 +142,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
 
@@ -182,14 +175,14 @@ install-data-hook: install-mime-database
 uninstall-hook: uninstall-mime-database
 install-mime-database:
 	@-if test -z "$(DESTDIR)"; then \
-		xdg-mime install --mode system --novendor $(Mimedir)/xboard.xml ;\
-		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-mime install --mode system --novendor xboard.xml ;\
+		xdg-desktop-menu install --mode system --novendor xboard-pgn-viewer.desktop;\
+		xdg-desktop-menu install --mode system --novendor xboard-fen-viewer.desktop;\
+		xdg-desktop-menu install --mode system --novendor xboard-tourney.desktop;\
+		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 \
@@ -198,7 +191,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