Allow overwriting of pretty service names. Add new tool bshell as combination of...

[catta] / avahi-ui / Makefile.am

diff --git a/avahi-ui/Makefile.am b/avahi-ui/Makefile.am
index c5ef64d22493bcb671fb23fbc5254cc276276627..0fd232faa311c2de05484c89b93ac654bae9392e 100644 (file)
--- a/avahi-ui/Makefile.am
+++ b/avahi-ui/Makefile.am
@@ -17,7 +17,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 
-AM_CFLAGS=-I$(top_srcdir)
+AM_CFLAGS=-I$(top_srcdir) -DG_DISABLE_DEPRECATED=1 -DGDK_DISABLE_DEPRECATED=1 -DGTK_DISABLE_DEPRECATED=1
 
 # This cool debug trap works on i386/gcc only
 AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
@@ -47,13 +47,13 @@ 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 = bssh
@@ -65,8 +65,9 @@ bssh_LDADD = $(AM_LDADD) $(GTK20_LIBS) ../avahi-client/libavahi-client.la ../ava
 
 install-exec-local:
        cd $(DESTDIR)/$(bindir) && \
-               rm -f bvnc && \
-               $(LN_S) bssh bvnc
+               rm -f bvnc bshell && \
+               $(LN_S) bssh bvnc && \
+               $(LN_S) bssh bshell
 
 bssh.desktop: bssh.desktop.in
        sed -e 's,@bindir\@,$(bindir),g' $< > $@