[banshee/stable-2.4] build: Don't run update-desktop-database in an empty folder
- From: Bertrand Lorentz <blorentz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [banshee/stable-2.4] build: Don't run update-desktop-database in an empty folder
- Date: Thu, 31 May 2012 21:43:35 +0000 (UTC)
commit 2941cc5f24328d1f1d75d85d4723cab9e2f4fee6
Author: Bertrand Lorentz <bertrand lorentz gmail com>
Date: Thu May 31 23:01:28 2012 +0200
build: Don't run update-desktop-database in an empty folder
During "make distcheck", update-desktop-database creates a cache file
which we have no reasonable way to remove. This left-over file now
breaks distcheck with recent automake versions.
We now only run update-desktop-database if DESTDIR is not set and if
there's already default mime-types in the target folder. That means it
will not be run when doing "make install" into an empty folder.
data/desktop-files/Makefile.am | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
---
diff --git a/data/desktop-files/Makefile.am b/data/desktop-files/Makefile.am
index a59c40d..012099e 100644
--- a/data/desktop-files/Makefile.am
+++ b/data/desktop-files/Makefile.am
@@ -17,6 +17,7 @@ endif
@INTLTOOL_DESKTOP_RULE@
install-data-hook:
+ test -f $(DESTDIR)$(datadir)/applications/defaults.list && \
test -z $(DESTDIR) && update-desktop-database $(DESTDIR)$(datadir)/applications || :
EXTRA_DIST = \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]