[d-feet] data: Don't run update-desktop-database if DESTDIR is set
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [d-feet] data: Don't run update-desktop-database if DESTDIR is set
- Date: Fri, 8 Nov 2013 00:30:08 +0000 (UTC)
commit 681639a1f5ed8e51c7e90793e2b17790123a95f1
Author: Colin Walters <walters verbum org>
Date: Thu Nov 7 19:27:34 2013 -0500
data: Don't run update-desktop-database if DESTDIR is set
This is the standard way to do these things; this avoids an error in
the gnome-continuous build.
data/Makefile.am | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index a7c44d8..55f0fe1 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -9,7 +9,7 @@ desktopdir = $(datadir)/applications
desktop_in_files = d-feet.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-UPDATE_DESKTOP = update-desktop-database $(datadir)/applications || :
+UPDATE_DESKTOP = if test -z "$(DESTDIR)"; then update-desktop-database $(datadir)/applications || : fi
@INTLTOOL_XML_RULE@
appdatadir = $(datadir)/appdata
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]