From bfed5afa641c09246e1b76c022799c98feb51cc4 Mon Sep 17 00:00:00 2001
From: Ted Percival <ted@midg3t.net>
Date: Fri, 8 Aug 2008 14:16:58 +1000
Subject: [PATCH] Add missing INTLTOOL_DESKTOP_RULE
Fixes desktop/menu files not showing up.
Desktop file translations now work.
Closes #234, #200.
---
avahi-ui/.gitignore | 2 ++
avahi-ui/Makefile.am | 12 ++++++++----
avahi-ui/{bssh.desktop.in => bssh.desktop.in.in} | 0
avahi-ui/{bvnc.desktop.in => bvnc.desktop.in.in} | 0
4 files changed, 10 insertions(+), 4 deletions(-)
rename avahi-ui/{bssh.desktop.in => bssh.desktop.in.in} (100%)
rename avahi-ui/{bvnc.desktop.in => bvnc.desktop.in.in} (100%)
diff --git a/avahi-ui/.gitignore b/avahi-ui/.gitignore
index 9d9493a..b942010 100644
|
a
|
b
|
|
| 2 | 2 | bvnc |
| 3 | 3 | bssh.desktop |
| 4 | 4 | bvnc.desktop |
| | 5 | bssh.desktop.in |
| | 6 | bvnc.desktop.in |
| 5 | 7 | *.o |
| 6 | 8 | *.lo |
| 7 | 9 | *.la |
diff --git a/avahi-ui/Makefile.am b/avahi-ui/Makefile.am
index 2d687ed..910dc6b 100644
|
a
|
b
|
|
| 24 | 24 | |
| 25 | 25 | desktopdir = $(datadir)/applications |
| 26 | 26 | desktop_DATA = |
| | 27 | desktop_DATA_in = $(desktop_DATA_in_in:.in.in=.in) |
| | 28 | desktop_DATA_in_in = bssh.desktop.in.in bvnc.desktop.in.in |
| 27 | 29 | |
| 28 | | EXTRA_DIST = bssh.desktop.in bvnc.desktop.in |
| | 30 | EXTRA_DIST = $(desktop_DATA_in_in) |
| 29 | 31 | |
| 30 | 32 | |
| 31 | 33 | if HAVE_GTK |
| … |
… |
|
| 70 | 72 | $(LN_S) bssh bvnc && \ |
| 71 | 73 | $(LN_S) bssh bshell |
| 72 | 74 | |
| 73 | | bssh.desktop: bssh.desktop.in |
| | 75 | bssh.desktop.in: bssh.desktop.in.in |
| 74 | 76 | sed -e 's,@bindir\@,$(bindir),g' $< > $@ |
| 75 | 77 | |
| 76 | | bvnc.desktop: bvnc.desktop.in |
| | 78 | bvnc.desktop.in: bvnc.desktop.in.in |
| 77 | 79 | sed -e 's,@bindir\@,$(bindir),g' $< > $@ |
| 78 | 80 | |
| 79 | 81 | endif # HAVE_GLIB |
| 80 | 82 | endif |
| 81 | 83 | endif |
| 82 | 84 | |
| 83 | | CLEANFILES = $(desktop_DATA) |
| | 85 | @INTLTOOL_DESKTOP_RULE@ |
| | 86 | |
| | 87 | CLEANFILES = $(desktop_DATA) $(desktop_DATA_in) |