Place the service type database in $(prefix)/lib/avahi instead of
$(libdir)/avahi.
EXTRA_DIST = __init__.py ServiceTypeDatabase.py.in
EXTRA_DIST = __init__.py ServiceTypeDatabase.py.in
+pkglibdatadir=$(prefix)/lib/avahi
+
if HAVE_PYTHON
avahidir = $(pythondir)/avahi
if HAVE_PYTHON
avahidir = $(pythondir)/avahi
if HAVE_GDBM
nodist_avahi_SCRIPTS = ServiceTypeDatabase.py
if HAVE_GDBM
nodist_avahi_SCRIPTS = ServiceTypeDatabase.py
-e 's,@FIRST_KEY\@,key = self.db.firstkey(),g' \
-e 's,@CHECK_KEY\@,while key is not None:,g' \
-e 's,@NEXT_KEY\@,key = self.db.nextkey(key),g' \
-e 's,@FIRST_KEY\@,key = self.db.firstkey(),g' \
-e 's,@CHECK_KEY\@,while key is not None:,g' \
-e 's,@NEXT_KEY\@,key = self.db.nextkey(key),g' \
- -e 's,@pkglibdir\@,$(pkglibdir),g' $< > $@ && \
+ -e 's,@pkglibdatadir\@,$(pkglibdatadir),g' $< > $@ && \
-e 's,@FIRST_KEY\@,keys = self.db.keys(),g' \
-e 's,@CHECK_KEY\@,for key in keys:,g' \
-e 's,@NEXT_KEY\@,,g' \
-e 's,@FIRST_KEY\@,keys = self.db.keys(),g' \
-e 's,@CHECK_KEY\@,for key in keys:,g' \
-e 's,@NEXT_KEY\@,,g' \
- -e 's,@pkglibdir\@,$(pkglibdir),g' $< > $@ && \
+ -e 's,@pkglibdatadir\@,$(pkglibdatadir),g' $< > $@ && \
class ServiceTypeDatabase:
"""ServiceTypeDatabase maps service types to descriptions"""
class ServiceTypeDatabase:
"""ServiceTypeDatabase maps service types to descriptions"""
- def __init__(self, filename = "@pkglibdir@/service-types.db"):
+ def __init__(self, filename = "@pkglibdatadir@/service-types.db"):
self.db = @DBM@.open(filename, "r")
self.db = @DBM@.open(filename, "r")
if not l[1] is None:
self.suffixes += (k + "@" + l[1], )
self.suffixes += (k, )
if not l[1] is None:
self.suffixes += (k + "@" + l[1], )
self.suffixes += (k, )
self.suffixes = tuple(map(lambda x: "["+x+"]", self.suffixes)) + ("", )
def __getitem__(self, key):
self.suffixes = tuple(map(lambda x: "["+x+"]", self.suffixes)) + ("", )
def __getitem__(self, key):
if self.db.has_key(key + suffix):
return True
if self.db.has_key(key + suffix):
return True
return False
def __contains__(self, item):
return False
def __contains__(self, item):
def values(self):
return list(self.itervalues())
def values(self):
return list(self.itervalues())
if __name__ == "__main__":
if __name__ == "__main__":
b = ServiceTypeDatabase()
print b.items()
b = ServiceTypeDatabase()
print b.items()
# This cool debug trap works on i386/gcc only
AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
# This cool debug trap works on i386/gcc only
AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
+pkglibdatadir=$(prefix)/lib/avahi
+
desktopdir = $(datadir)/applications
desktop_DATA =
desktop_DATA_in = $(desktop_DATA_in_in:.in.in=.in)
desktopdir = $(datadir)/applications
desktop_DATA =
desktop_DATA_in = $(desktop_DATA_in_in:.in.in=.in)
if HAVE_GDBM
libavahi_ui_la_SOURCES += ../avahi-utils/stdb.h ../avahi-utils/stdb.c
if HAVE_GDBM
libavahi_ui_la_SOURCES += ../avahi-utils/stdb.h ../avahi-utils/stdb.c
-libavahi_ui_la_CFLAGS += -DDATABASE_FILE=\"$(pkglibdir)/service-types.db\"
+libavahi_ui_la_CFLAGS += -DDATABASE_FILE=\"$(pkglibdatadir)/service-types.db\"
libavahi_ui_la_LIBADD += -lgdbm
libavahi_ui_la_LIBADD += -lgdbm
-libavahi_ui_gtk3_la_CFLAGS += -DDATABASE_FILE=\"$(pkglibdir)/service-types.db\"
+libavahi_ui_gtk3_la_CFLAGS += -DDATABASE_FILE=\"$(pkglibdatadir)/service-types.db\"
libavahi_ui_gtk3_la_LIBADD += -lgdbm
endif
if HAVE_DBM
libavahi_ui_la_SOURCES += ../avahi-utils/stdb.h ../avahi-utils/stdb.c
libavahi_ui_gtk3_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=\"$(pkglibdir)/service-types.db\"
+libavahi_ui_la_CFLAGS += -DDATABASE_FILE=\"$(pkglibdatadir)/service-types.db\"
-libavahi_ui_gtk3_la_CFLAGS += -DDATABASE_FILE=\"$(pkglibdir)/service-types.db\"
+libavahi_ui_gtk3_la_CFLAGS += -DDATABASE_FILE=\"$(pkglibdatadir)/service-types.db\"
endif
bin_PROGRAMS = bssh
endif
bin_PROGRAMS = bssh
# This cool debug trap works on i386/gcc only
AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
# This cool debug trap works on i386/gcc only
AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
+pkglibdatadir=$(prefix)/lib/avahi
+
if HAVE_DBUS
bin_PROGRAMS = avahi-browse avahi-resolve avahi-publish avahi-set-host-name
if HAVE_DBUS
bin_PROGRAMS = avahi-browse avahi-resolve avahi-publish avahi-set-host-name
if HAVE_GDBM
avahi_browse_SOURCES += stdb.h stdb.c
if HAVE_GDBM
avahi_browse_SOURCES += stdb.h stdb.c
-avahi_browse_CFLAGS += -DDATABASE_FILE=\"$(pkglibdir)/service-types.db\"
+avahi_browse_CFLAGS += -DDATABASE_FILE=\"$(pkglibdatadir)/service-types.db\"
avahi_browse_LDADD += -lgdbm
endif
if HAVE_DBM
avahi_browse_SOURCES += stdb.h stdb.c
avahi_browse_LDADD += -lgdbm
endif
if HAVE_DBM
avahi_browse_SOURCES += stdb.h stdb.c
-avahi_browse_CFLAGS += -DDATABASE_FILE=\"$(pkglibdir)/service-types.db\"
+avahi_browse_CFLAGS += -DDATABASE_FILE=\"$(pkglibdatadir)/service-types.db\"
endif
avahi_resolve_SOURCES = avahi-resolve.c sigint.c sigint.h
endif
avahi_resolve_SOURCES = avahi-resolve.c sigint.c sigint.h
EXTRA_DIST=build-db.in service-types
EXTRA_DIST=build-db.in service-types
+pkglibdatadir=$(prefix)/lib/avahi
+
pkgdata_DATA=service-types
pkgdata_DATA=service-types
if HAVE_PYTHON
if HAVE_GDBM
noinst_SCRIPTS=build-db
if HAVE_PYTHON
if HAVE_GDBM
noinst_SCRIPTS=build-db
-pkglib_DATA+=service-types.db
+pkglibdata_DATA+=service-types.db
build-db: build-db.in
$(AM_V_GEN)sed -e 's,@PYTHON\@,$(PYTHON),g' \
build-db: build-db.in
$(AM_V_GEN)sed -e 's,@PYTHON\@,$(PYTHON),g' \
if HAVE_DBM
noinst_SCRIPTS=build-db
if HAVE_DBM
noinst_SCRIPTS=build-db
-pkglib_DATA+=service-types.db.pag service-types.db.dir
+pkglibdata_DATA+=service-types.db.pag service-types.db.dir
build-db: build-db.in
$(AM_V_GEN)sed -e 's,@PYTHON\@,$(PYTHON),g' \
build-db: build-db.in
$(AM_V_GEN)sed -e 's,@PYTHON\@,$(PYTHON),g' \