From c7ecad8fa467b8be2b34064020e2c541c480645e Mon Sep 17 00:00:00 2001 From: Ted Percival Date: Fri, 8 Aug 2008 04:16:58 +1000 Subject: [PATCH] Add missing INTLTOOL_DESKTOP_RULE Add missing INTLTOOL_DESKTOP_RULE Fixes desktop/menu files not showing up. Desktop file translations now work. Closes #234, #200. Signed-off-by: Lennart Poettering --- 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/avahi-ui/.gitignore +++ b/avahi-ui/.gitignore @@ -2,6 +2,8 @@ bssh bvnc bssh.desktop bvnc.desktop +bssh.desktop.in +bvnc.desktop.in *.o *.lo *.la diff --git a/avahi-ui/Makefile.am b/avahi-ui/Makefile.am index 2d687ed..910dc6b 100644 --- a/avahi-ui/Makefile.am +++ b/avahi-ui/Makefile.am @@ -24,8 +24,10 @@ AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")' desktopdir = $(datadir)/applications desktop_DATA = +desktop_DATA_in = $(desktop_DATA_in_in:.in.in=.in) +desktop_DATA_in_in = bssh.desktop.in.in bvnc.desktop.in.in -EXTRA_DIST = bssh.desktop.in bvnc.desktop.in +EXTRA_DIST = $(desktop_DATA_in_in) if HAVE_GTK @@ -70,14 +72,16 @@ install-exec-local: $(LN_S) bssh bvnc && \ $(LN_S) bssh bshell -bssh.desktop: bssh.desktop.in +bssh.desktop.in: bssh.desktop.in.in sed -e 's,@bindir\@,$(bindir),g' $< > $@ -bvnc.desktop: bvnc.desktop.in +bvnc.desktop.in: bvnc.desktop.in.in sed -e 's,@bindir\@,$(bindir),g' $< > $@ endif # HAVE_GLIB endif endif -CLEANFILES = $(desktop_DATA) +@INTLTOOL_DESKTOP_RULE@ + +CLEANFILES = $(desktop_DATA) $(desktop_DATA_in) diff --git a/avahi-ui/bssh.desktop.in b/avahi-ui/bssh.desktop.in.in similarity index 100% rename from avahi-ui/bssh.desktop.in rename to avahi-ui/bssh.desktop.in.in diff --git a/avahi-ui/bvnc.desktop.in b/avahi-ui/bvnc.desktop.in.in similarity index 100% rename from avahi-ui/bvnc.desktop.in rename to avahi-ui/bvnc.desktop.in.in -- 2.39.5