[hitori] Don't use INTLTOOL_DESKTOP_RULE
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [hitori] Don't use INTLTOOL_DESKTOP_RULE
- Date: Sun, 17 Oct 2010 19:55:51 +0000 (UTC)
commit f60123b0d3f9d69f454a1cd51005707e9a9f0d3f
Author: Philip Withnall <philip tecnocode co uk>
Date: Sun Oct 17 20:55:01 2010 +0100
Don't use INTLTOOL_DESKTOP_RULE
Since we've switched to non-recursive automake and subdir-objects, it breaks
when builddir != srcdir due to lp#605826. We copy the rule in and fix it up
to not break.
Makefile.am | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index ff5c7f0..924a791 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -74,7 +74,9 @@ uidir = $(datadir)/hitori
ui_DATA = data/hitori.ui
# Desktop file
- INTLTOOL_DESKTOP_RULE@
+# We can't use INTLTOOL_DESKTOP_RULE here due to lp#605826
+%.desktop: %.desktop.in
+ $(MKDIR_P) $(dir $@); LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
desktop_in_files = data/hitori.desktop.in
desktopdir = $(datadir)/applications
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]