[banshee] Run update-desktop-database, ignore if it fails
- From: Aaron Bockover <abock src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [banshee] Run update-desktop-database, ignore if it fails
- Date: Thu, 8 Jul 2010 01:25:54 +0000 (UTC)
commit 1dec210145b337a934b27080b2f1d7aca43c6da5
Author: Aaron Bockover <abockover novell com>
Date: Wed Jul 7 19:49:22 2010 -0400
Run update-desktop-database, ignore if it fails
Also ignore update-mime-database failures
data/desktop-files/Makefile.am | 3 +++
src/Extensions/Banshee.AmazonMp3/Makefile.am | 2 +-
2 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/data/desktop-files/Makefile.am b/data/desktop-files/Makefile.am
index 70a4b5f..9018d29 100644
--- a/data/desktop-files/Makefile.am
+++ b/data/desktop-files/Makefile.am
@@ -16,6 +16,9 @@ endif
@INTLTOOL_DESKTOP_RULE@
+install-data-hook:
+ update-desktop-database $(DESTDIR)$(datadir)/applications || :
+
EXTRA_DIST = \
$(desktop_in_files) \
$(DESKTOP_MIME_DEPS) \
diff --git a/src/Extensions/Banshee.AmazonMp3/Makefile.am b/src/Extensions/Banshee.AmazonMp3/Makefile.am
index 6671f64..826bfff 100644
--- a/src/Extensions/Banshee.AmazonMp3/Makefile.am
+++ b/src/Extensions/Banshee.AmazonMp3/Makefile.am
@@ -23,7 +23,7 @@ bamz: bamz.in
@echo ' GEN $@'; sed 's,@bansheedir@,$(pkglibdir),g' < $< > $@
define EXTRA_INSTALL_DATA_HOOK
- update-mime-database $(DESTDIR)$(datadir)/mime
+ update-mime-database $(DESTDIR)$(datadir)/mime || :
endef
include $(top_srcdir)/build/build.mk
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]