build-sys: actually, we need to place the service type database in lib64, not uncondi...

gdbm creates word width dependent files, hence this needs to be included
in the multi-arch logic.

diff --git a/avahi-python/avahi/Makefile.am b/avahi-python/avahi/Makefile.am
index 081398631bdb4641144a878260b0d6a8fe74db51..3eb67d0df438a7f8b0f8e0d470a4fe7a68102625 100644 (file)
--- a/avahi-python/avahi/Makefile.am
+++ b/avahi-python/avahi/Makefile.am
@@ -17,7 +17,7 @@
 
 EXTRA_DIST = __init__.py ServiceTypeDatabase.py.in
 
-pkglibdatadir=$(prefix)/lib/avahi
+pkglibdatadir=$(libdir)/avahi
 
 if HAVE_PYTHON
 

diff --git a/avahi-ui/Makefile.am b/avahi-ui/Makefile.am
index bb0f64730981c1ad6556266bd0e606c573f610cf..55233259961c4cc9ec92856bbcb9821dce676c7c 100644 (file)
--- a/avahi-ui/Makefile.am
+++ b/avahi-ui/Makefile.am
@@ -20,7 +20,7 @@ AM_CFLAGS=-I$(top_srcdir) -DG_DISABLE_DEPRECATED=1 -DGDK_DISABLE_DEPRECATED=1 -D
 # This cool debug trap works on i386/gcc only
 AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 
-pkglibdatadir=$(prefix)/lib/avahi
+pkglibdatadir=$(libdir)/avahi
 
 desktopdir = $(datadir)/applications
 desktop_DATA =

diff --git a/avahi-utils/Makefile.am b/avahi-utils/Makefile.am
index a1fc3a54930b5d1806a8af25873476fa1a4aa72b..a644b4a99767f6d7966b9054596d1f1a89607215 100644 (file)
--- a/avahi-utils/Makefile.am
+++ b/avahi-utils/Makefile.am
@@ -20,7 +20,7 @@ AM_CFLAGS=-I$(top_srcdir)
 # This cool debug trap works on i386/gcc only
 AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 
-pkglibdatadir=$(prefix)/lib/avahi
+pkglibdatadir=$(libdir)/avahi
 
 if HAVE_DBUS
 

diff --git a/service-type-database/Makefile.am b/service-type-database/Makefile.am
index 1e9e70f9e89054a9709d4b7cd68dcd2fb2dcce9d..b43e2cb71c47237dba1193829d49c28f708b4d76 100644 (file)
--- a/service-type-database/Makefile.am
+++ b/service-type-database/Makefile.am
@@ -17,7 +17,7 @@
 
 EXTRA_DIST=build-db.in service-types
 
-pkglibdatadir=$(prefix)/lib/avahi
+pkglibdatadir=$(libdir)/avahi
 
 pkgdata_DATA=service-types
 pkglibdata_DATA=