build-sys: compatibility with newer automake
Place the service type database in $(prefix)/lib/avahi instead of
$(libdir)/avahi.
diff --git a/avahi-python/avahi/Makefile.am b/avahi-python/avahi/Makefile.am
index 907c5eb..0813986 100644
--- a/avahi-python/avahi/Makefile.am
+++ b/avahi-python/avahi/Makefile.am
@@ -17,11 +17,12 @@
EXTRA_DIST = __init__.py ServiceTypeDatabase.py.in
+pkglibdatadir=$(prefix)/lib/avahi
+
if HAVE_PYTHON
avahidir = $(pythondir)/avahi
-
if HAVE_GDBM
nodist_avahi_SCRIPTS = ServiceTypeDatabase.py
@@ -31,7 +32,7 @@
-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' $< > $@ && \
chmod +x $@
endif
@@ -44,7 +45,7 @@
-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' $< > $@ && \
chmod +x $@
endif
diff --git a/avahi-python/avahi/ServiceTypeDatabase.py.in b/avahi-python/avahi/ServiceTypeDatabase.py.in
index 8ad8d5e..b2035fd 100644
--- a/avahi-python/avahi/ServiceTypeDatabase.py.in
+++ b/avahi-python/avahi/ServiceTypeDatabase.py.in
@@ -26,7 +26,7 @@
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")
@@ -46,13 +46,13 @@
if i >= 0:
k = l[0][:i]
-
+
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):
@@ -75,7 +75,7 @@
if self.db.has_key(key + suffix):
return True
-
+
return False
def __contains__(self, item):
@@ -86,7 +86,7 @@
return True
return False
-
+
def __iter__(self):
@@ -134,9 +134,9 @@
def values(self):
return list(self.itervalues())
-
+
if __name__ == "__main__":
-
+
b = ServiceTypeDatabase()
print b.items()
diff --git a/avahi-ui/Makefile.am b/avahi-ui/Makefile.am
index 72d6023..bb0f647 100644
--- a/avahi-ui/Makefile.am
+++ b/avahi-ui/Makefile.am
@@ -20,6 +20,8 @@
# 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)
@@ -62,18 +64,18 @@
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_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_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
diff --git a/avahi-utils/Makefile.am b/avahi-utils/Makefile.am
index 1b0443c..a1fc3a5 100644
--- a/avahi-utils/Makefile.am
+++ b/avahi-utils/Makefile.am
@@ -20,6 +20,8 @@
# 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
@@ -30,13 +32,13 @@
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_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
diff --git a/service-type-database/Makefile.am b/service-type-database/Makefile.am
index fa1bd40..1e9e70f 100644
--- a/service-type-database/Makefile.am
+++ b/service-type-database/Makefile.am
@@ -17,14 +17,16 @@
EXTRA_DIST=build-db.in service-types
+pkglibdatadir=$(prefix)/lib/avahi
+
pkgdata_DATA=service-types
-pkglib_DATA=
+pkglibdata_DATA=
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' \
@@ -41,7 +43,7 @@
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' \