From c5c2461eeadd57fe68d606efae38bd960e15bcfa Mon Sep 17 00:00:00 2001
From: Jaromil <jaromil@dyne.org>
Date: Thu, 26 May 2011 16:43:54 +0200
Subject: [PATCH] fixing mime defaults and icon installations

---
 configure.ac       |  2 +-
 share/Makefile.am  | 22 +++++++++++-----------
 share/tomb.desktop |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/configure.ac b/configure.ac
index dae4d31..c4311c6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl ==============================================================
 
 AC_PREREQ([2.60])
 
-AC_INIT([Tomb],[1.0],[jaromil@dyne.org],[Tomb])
+AC_INIT([Tomb],[1.1],[jaromil@dyne.org],[Tomb])
 AC_CONFIG_MACRO_DIR([m4])
 
 AC_CANONICAL_HOST
diff --git a/share/Makefile.am b/share/Makefile.am
index a93bfe9..2405dc4 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -1,39 +1,39 @@
-Applicationsdir = $(datadir)/applications
+Applicationsdir = $(DESTDIR)/$(datadir)/applications
 Applications_DATA = tomb.desktop
 
-AppRegdir = $(datadir)/application-registry
+AppRegdir = $(DESTDIR)/$(datadir)/application-registry
 AppReg_DATA = tomb.applications
 
-MimeInfodir = $(datadir)/mime-info
+MimeInfodir = $(DESTDIR)/$(datadir)/mime-info
 MimeInfo_DATA = tomb.keys tomb.mime
 
-Menudir = $(datadir)/menu
+Menudir = $(DESTDIR)/$(datadir)/menu
 Menu_DATA = tomb
 
-Iconsdir = $(datadir)/icons
+Iconsdir = $(DESTDIR)/$(datadir)/icons
 Icons_DATA = monmort.png
  
-AppInstIcondir = $(datadir)/app-install/icons
+AppInstIcondir = $(DESTDIR)/$(datadir)/app-install/icons
 AppInstIcon_DATA = monmort.png
 
-AppInstDeskdir = $(datadir)/app-install/desktop
+AppInstDeskdir = $(DESTDIR)/$(datadir)/app-install/desktop
 AppInstDesk_DATA = tomb.desktop
 
 gtkrc:
 	sed -e 's@\%prefix\%@'"$(datadir)"'@' gtkrc.in > gtkrc
 
-GtkRcdir = $(datadir)/themes/tomb/gtk-2.0-key
+GtkRcdir = $(DESTDIR)/$(datadir)/themes/tomb/gtk-2.0-key
 GtkRc_DATA = gtkrc
 
-MimePkgdir = $(prefix)/lib/mime/packages/tomb
+MimePkgdir = $(DESTDIR)/$(prefix)/lib/mime/packages/tomb
 MimePkg = tomb.mimepkg
 
 install-data-hook:
 	@echo "installing mime type"
-	@install -D dyne-tomb.xml $(DESTDIR)$(datadir)/mime/packages
+	@install -D dyne-tomb.xml $(DESTDIR)/$(datadir)/mime/packages
 	@if ! [ -n `which xdg-mime` ]; then xdg-mime install dyne-tomb.xml; fi
 	@echo "installing icons";
-	@install -D monmort.png $(DESTDIR)$(datadir)/pixmaps
+	@install -D monmort.png $(DESTDIR)/$(datadir)/pixmaps
 	@if ! [ -n `which xdg-icon-resource` ]; then \
 		xdg-icon-resource install --context mimetypes --size 32 ../src/monmort.xpm monmort; \
 		xdg-icon-resource install --size 32 ../src/monmort.xpm dyne-monmort; fi
diff --git a/share/tomb.desktop b/share/tomb.desktop
index 61da832..fdc1319 100644
--- a/share/tomb.desktop
+++ b/share/tomb.desktop
@@ -6,7 +6,7 @@ GenericName=Crypto undertaker
 Comment=Keep your bones safe
 Exec=tomb-open %U
 TryExec=tomb-open
-Icon=monmort.xpm
+Icon=monmort
 Terminal=true
 Categories=Utility;Security;Archiving;Filesystem;
 MimeType=application/x-tomb-volume;