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 <lennart@poettering.net>

diff --git a/avahi-ui/.gitignore b/avahi-ui/.gitignore
index 9d9493a3ab3ea13bfeb8d0249da56f4815afe47d..b9420104287a5b912c2b28f23ef7db5c1218de3d 100644 (file)
--- 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 2d687ed712491238471a5b1d601b34e2864476e4..910dc6b1c5738194baaccd46ba7bb1c1e9a01451 100644 (file)
--- 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
deleted file mode 100644 (file)
index 69f56b6..0000000
--- a/avahi-ui/bssh.desktop.in
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Encoding=UTF-8
-_Name=Avahi SSH Server Browser
-_Comment=Browse for Zeroconf-enabled SSH Servers
-Exec=@bindir@/bssh
-Terminal=false
-Type=Application
-Icon=network-wired
-Categories=GNOME;Application;Network;
-StartupNotify=false
-GenericName=

diff --git a/avahi-ui/bssh.desktop.in.in b/avahi-ui/bssh.desktop.in.in
new file mode 100644 (file)
index 0000000..69f56b6
--- /dev/null
+++ b/avahi-ui/bssh.desktop.in.in
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+_Name=Avahi SSH Server Browser
+_Comment=Browse for Zeroconf-enabled SSH Servers
+Exec=@bindir@/bssh
+Terminal=false
+Type=Application
+Icon=network-wired
+Categories=GNOME;Application;Network;
+StartupNotify=false
+GenericName=

diff --git a/avahi-ui/bvnc.desktop.in b/avahi-ui/bvnc.desktop.in
deleted file mode 100644 (file)
index 799c7d2..0000000
--- a/avahi-ui/bvnc.desktop.in
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Encoding=UTF-8
-_Name=Avahi VNC Server Browser
-_Comment=Browse for Zeroconf-enabled VNC Servers
-Exec=@bindir@/bvnc
-Terminal=false
-Type=Application
-Icon=network-wired
-Categories=GNOME;Application;Network;
-StartupNotify=false
-GenericName=

diff --git a/avahi-ui/bvnc.desktop.in.in b/avahi-ui/bvnc.desktop.in.in
new file mode 100644 (file)
index 0000000..799c7d2
--- /dev/null
+++ b/avahi-ui/bvnc.desktop.in.in
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+_Name=Avahi VNC Server Browser
+_Comment=Browse for Zeroconf-enabled VNC Servers
+Exec=@bindir@/bvnc
+Terminal=false
+Type=Application
+Icon=network-wired
+Categories=GNOME;Application;Network;
+StartupNotify=false
+GenericName=