summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2007-09-06 17:49:29 +0000
committerLennart Poettering <lennart@poettering.net>2007-09-06 17:49:29 +0000
commitc26c9b195bd3eb56880abdec89a8a02d045046d4 (patch)
tree2938f3bcdf6cfe78a4c87f5f35ae6d0f4d1dcd78
parent373dc531148992c6a5cf57b2fae29286afd70488 (diff)
downloadavahi-c26c9b195bd3eb56880abdec89a8a02d045046d4.tar.gz
service-types.db belongs in /lib, closes #171, rhbz 274731
git-svn-id: file:///home/lennart/svn/public/avahi/trunk@1537 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
-rw-r--r--avahi-ui/Makefile.am4
-rw-r--r--avahi-utils/Makefile.am4
-rw-r--r--service-type-database/Makefile.am5
3 files changed, 7 insertions, 6 deletions
diff --git a/avahi-ui/Makefile.am b/avahi-ui/Makefile.am
index c5ef64d..1cda530 100644
--- a/avahi-ui/Makefile.am
+++ b/avahi-ui/Makefile.am
@@ -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
diff --git a/avahi-utils/Makefile.am b/avahi-utils/Makefile.am
index 3d371b0..21993c3 100644
--- a/avahi-utils/Makefile.am
+++ b/avahi-utils/Makefile.am
@@ -32,13 +32,13 @@ avahi_browse_LDADD = $(AM_LDADD) ../avahi-client/libavahi-client.la ../avahi-com
if HAVE_GDBM
avahi_browse_SOURCES += stdb.h stdb.c
-avahi_browse_CFLAGS += -DDATABASE_FILE=\"$(pkgdatadir)/service-types.db\"
+avahi_browse_CFLAGS += -DDATABASE_FILE=\"$(pkglibdir)/service-types.db\"
avahi_browse_LDADD += -lgdbm
endif
if HAVE_DBM
avahi_browse_SOURCES += stdb.h stdb.c
-avahi_browse_CFLAGS += -DDATABASE_FILE=\"$(pkgdatadir)/service-types.db\"
+avahi_browse_CFLAGS += -DDATABASE_FILE=\"$(pkglibdir)/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 c41dc70..60fda45 100644
--- a/service-type-database/Makefile.am
+++ b/service-type-database/Makefile.am
@@ -20,12 +20,13 @@
EXTRA_DIST=build-db.in service-types
pkgdata_DATA=service-types
+pkglib_DATA=
if HAVE_PYTHON
if HAVE_GDBM
noinst_SCRIPTS=build-db
-pkgdata_DATA+=service-types.db
+pkglib_DATA+=service-types.db
build-db: build-db.in
sed -e 's,@PYTHON\@,$(PYTHON),g' \
@@ -42,7 +43,7 @@ endif
if HAVE_DBM
noinst_SCRIPTS=build-db
-pkgdata_DATA+=service-types.db.pag service-types.db.dir
+pkglib_DATA+=service-types.db.pag service-types.db.dir
build-db: build-db.in
sed -e 's,@PYTHON\@,$(PYTHON),g' \