summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2007-09-25 00:25:26 +0000
committerLennart Poettering <lennart@poettering.net>2007-09-25 00:25:26 +0000
commit331465566be1e1821c0bb3738f8de130dd8c19f8 (patch)
tree413a2c5429b61b0e279458102dcb20daeece21b4
parentc7a24cd92eeff94503cd2ef831183257baeee0a1 (diff)
update path to the new service type db path for avahi-discover, too
git-svn-id: file:///home/lennart/svn/public/avahi/trunk@1540 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
-rw-r--r--avahi-python/avahi/Makefile.am4
-rw-r--r--avahi-python/avahi/ServiceTypeDatabase.py.in2
2 files changed, 3 insertions, 3 deletions
diff --git a/avahi-python/avahi/Makefile.am b/avahi-python/avahi/Makefile.am
index 2fff218..4a73022 100644
--- a/avahi-python/avahi/Makefile.am
+++ b/avahi-python/avahi/Makefile.am
@@ -33,7 +33,7 @@ ServiceTypeDatabase.py: ServiceTypeDatabase.py.in
-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,@pkgdatadir\@,$(pkgdatadir),g' $< > $@
+ -e 's,@pkglibdir\@,$(pkglibdir),g' $< > $@
chmod +x $@
endif
@@ -46,7 +46,7 @@ ServiceTypeDatabase.py: ServiceTypeDatabase.py.in
-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,@pkgdatadir\@,$(pkgdatadir),g' $< > $@
+ -e 's,@pkglibdir\@,$(pkglibdir),g' $< > $@
chmod +x $@
endif
diff --git a/avahi-python/avahi/ServiceTypeDatabase.py.in b/avahi-python/avahi/ServiceTypeDatabase.py.in
index 95c03a4..d134510 100644
--- a/avahi-python/avahi/ServiceTypeDatabase.py.in
+++ b/avahi-python/avahi/ServiceTypeDatabase.py.in
@@ -27,7 +27,7 @@ locale.setlocale(locale.LC_ALL, '')
class ServiceTypeDatabase:
- def __init__(self, filename = "@pkgdatadir@/service-types.db"):
+ def __init__(self, filename = "@pkglibdir@/service-types.db"):
self.db = @DBM@.open(filename, "r")