diff options
| author | Lennart Poettering <lennart@poettering.net> | 2012-02-14 23:24:31 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2012-02-14 23:24:31 +0100 |
| commit | 4c0b4cbf9c597f6df6a3220dec5438f4fe9e551b (patch) | |
| tree | 5f08c9480acfe4ee49af81cf843f6dc6e86ce7eb | |
| parent | 5622f49f788abafea96420b553eb0138eb605c55 (diff) | |
build-sys: actually, we need to place the service type database in lib64, not unconditionally in lib/v0.6.31
gdbm creates word width dependent files, hence this needs to be included
in the multi-arch logic.
| -rw-r--r-- | avahi-python/avahi/Makefile.am | 2 | ||||
| -rw-r--r-- | avahi-ui/Makefile.am | 2 | ||||
| -rw-r--r-- | avahi-utils/Makefile.am | 2 | ||||
| -rw-r--r-- | service-type-database/Makefile.am | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/avahi-python/avahi/Makefile.am b/avahi-python/avahi/Makefile.am index 0813986..3eb67d0 100644 --- 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 bb0f647..5523325 100644 --- 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 a1fc3a5..a644b4a 100644 --- 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 1e9e70f..b43e2cb 100644 --- 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= |