[meld] Fix Makefile and desktop file for desktop integration points

[Kai Willadsen <kaiw src gnome org>]

commit 8dd4841b556417ec031425672babe37caf0e277e
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sun Dec 16 11:38:10 2012 +1000

    Fix Makefile and desktop file for desktop integration points

 Makefile             |    9 ++++++---
 data/meld.desktop.in |    2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/Makefile b/Makefile
index eff61e1..dca92b3 100644
--- a/Makefile
+++ b/Makefile
@@ -39,6 +39,7 @@ install: $(addsuffix .install,$(SPECIALS)) meld.desktop
 		$(DESTDIR)$(sharedir_)/icons \
 		$(DESTDIR)$(docdir_) \
 		$(DESTDIR)$(sharedir)/applications \
+		$(DESTDIR)$(sharedir)/mime/packages \
 		$(DESTDIR)$(sharedir)/pixmaps \
 		$(DESTDIR)$(sharedir)/icons/hicolor/16x16/apps \
 		$(DESTDIR)$(sharedir)/icons/hicolor/22x22/apps \
@@ -91,12 +92,13 @@ install: $(addsuffix .install,$(SPECIALS)) meld.desktop
 		$(DESTDIR)$(sharedir)/icons/HighContrast/scalable/apps/meld.svg
 	$(MAKE) -C po install
 	$(MAKE) -C help install
-    update-mime-database $(DESTDIR)$(sharedir)/mime
+	update-mime-database $(DESTDIR)$(sharedir)/mime
+	update-desktop-database $(DESTDIR)$(sharedir)/applications
 
 meld.desktop: data/meld.desktop.in
 	intltool-merge -d po data/meld.desktop.in data/meld.desktop
 
-meld.xml: data/meld.xml.in
+meld.xml: data/mime/meld.xml.in
 	intltool-merge -d po data/mime/meld.xml.in data/mime/meld.xml
 
 %.install: %
@@ -120,5 +122,6 @@ uninstall:
 		$(sharedir)/pixmaps/meld.png
 	$(MAKE) -C po uninstall
 	$(MAKE) -C help uninstall
-    update-mime-database $(DESTDIR)$(sharedir)/mime
+	update-mime-database $(DESTDIR)$(sharedir)/mime
+	update-desktop-database $(DESTDIR)$(sharedir)/applications
 
diff --git a/data/meld.desktop.in b/data/meld.desktop.in
index 494c12c..182091a 100644
--- a/data/meld.desktop.in
+++ b/data/meld.desktop.in
@@ -3,7 +3,7 @@ _Name=Meld
 _GenericName=Diff Viewer
 _X-GNOME-FullName=Meld Diff Viewer
 _Comment=Compare and merge your files
-Exec=meld %F
+Exec=meld --comparison-file=%F
 Terminal=false
 Type=Application
 Icon=meld