diff options
| author | Lennart Poettering <lennart@poettering.net> | 2008-09-08 21:26:21 +0300 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2008-09-08 21:26:21 +0300 |
| commit | c90c318dbbfa73a00951cdf96c51d13d7b23c44a (patch) | |
| tree | 7130f492ad0983a0f807fea02bfc9a0c144d9f3c /avahi-ui | |
| parent | 0f4e5df89826ac152c1091ca41f44ff283b4a590 (diff) | |
| parent | b7d12d0d6e81c9c9d657dfe082563ca558179426 (diff) | |
Merge branch 'master' of ssh://rootserver/home/lennart/git/public/avahi
Diffstat (limited to 'avahi-ui')
| -rw-r--r-- | avahi-ui/.gitignore | 2 | ||||
| -rw-r--r-- | avahi-ui/Makefile.am | 12 | ||||
| -rw-r--r-- | avahi-ui/bssh.desktop.in.in (renamed from avahi-ui/bssh.desktop.in) | 0 | ||||
| -rw-r--r-- | avahi-ui/bvnc.desktop.in.in (renamed from avahi-ui/bvnc.desktop.in) | 0 |
4 files changed, 10 insertions, 4 deletions
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 index 69f56b6..69f56b6 100644 --- a/avahi-ui/bssh.desktop.in +++ b/avahi-ui/bssh.desktop.in.in diff --git a/avahi-ui/bvnc.desktop.in b/avahi-ui/bvnc.desktop.in.in index 799c7d2..799c7d2 100644 --- a/avahi-ui/bvnc.desktop.in +++ b/avahi-ui/bvnc.desktop.in.in |