service-types.db belongs in /lib, closes #171, rhbz 274731

[catta] / avahi-ui / Makefile.am

diff --git a/avahi-ui/Makefile.am b/avahi-ui/Makefile.am
index 854eacffae7abe5b7686d2a9a5bfb79b7705fc99..1cda53025691bbd47e7aa5d5c7a0338607074233 100644 (file)
--- a/avahi-ui/Makefile.am
+++ b/avahi-ui/Makefile.am
@@ -22,7 +22,13 @@ AM_CFLAGS=-I$(top_srcdir)
 # This cool debug trap works on i386/gcc only
 AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 
-if HAVE_GLIB
+desktopdir = $(datadir)/applications
+desktop_DATA = 
+
+EXTRA_DIST = bssh.desktop.in bvnc.desktop.in
+
+
+if HAVE_GTK
 if HAVE_DBUS
 
 avahiincludedir=$(includedir)/avahi-ui
@@ -41,25 +47,34 @@ libavahi_ui_la_LDFLAGS = $(AM_LDFLAGS) -export-dynamic -version-info $(LIBAVAHI_
 
 if HAVE_GDBM
 libavahi_ui_la_SOURCES += ../avahi-utils/stdb.h ../avahi-utils/stdb.c
-libavahi_ui_la_CFLAGS += -DDATABASE_FILE=\"$(pkgdatadir)/service-types.db\"
+libavahi_ui_la_CFLAGS += -DDATABASE_FILE=\"$(pkglibdir)/service-types.db\"
 libavahi_ui_la_LIBADD += -lgdbm
 endif
 
 if HAVE_DBM
 libavahi_ui_la_SOURCES += ../avahi-utils/stdb.h ../avahi-utils/stdb.c
-libavahi_ui_la_CFLAGS += -DDATABASE_FILE=\"$(pkgdatadir)/service-types.db\"
+libavahi_ui_la_CFLAGS += -DDATABASE_FILE=\"$(pkglibdir)/service-types.db\"
 endif
 
-bin_PROGRAMS = zssh
+bin_PROGRAMS = bssh
+desktop_DATA += bssh.desktop bvnc.desktop
 
-zssh_SOURCES = zssh.c
-zssh_CFLAGS = $(AM_CFLAGS) $(GTK20_CFLAGS)
-zssh_LDADD = $(AM_LDADD) $(GTK20_LIBS) ../avahi-client/libavahi-client.la ../avahi-common/libavahi-common.la libavahi-ui.la
+bssh_SOURCES = bssh.c
+bssh_CFLAGS = $(AM_CFLAGS) $(GTK20_CFLAGS)
+bssh_LDADD = $(AM_LDADD) $(GTK20_LIBS) ../avahi-client/libavahi-client.la ../avahi-common/libavahi-common.la libavahi-ui.la
 
 install-exec-local:
        cd $(DESTDIR)/$(bindir) && \
-               rm -f zvnc && \
-               $(LN_S) zssh zvnc
+               rm -f bvnc && \
+               $(LN_S) bssh bvnc
+
+bssh.desktop: bssh.desktop.in
+       sed -e 's,@bindir\@,$(bindir),g' $< > $@
+
+bvnc.desktop: bvnc.desktop.in
+       sed -e 's,@bindir\@,$(bindir),g' $< > $@
 
 endif
 endif
+
+CLEANFILES = $(desktop_DATA)