diff options
author | Lennart Poettering <lennart@poettering.net> | 2012-02-14 22:43:03 +0100 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2012-02-14 22:43:03 +0100 |
commit | e98b5b0df0b6241a59a39cda8f78c7d8d4622881 (patch) | |
tree | 8e50f0bf79d4424a70b7c8ce309e70c0638e01f4 /avahi-ui | |
parent | 826ad91480c05fb3672aa938fc9f1ced3034a0e8 (diff) |
build-sys: compatibility with newer automake
Place the service type database in $(prefix)/lib/avahi instead of
$(libdir)/avahi.
Diffstat (limited to 'avahi-ui')
-rw-r--r-- | avahi-ui/Makefile.am | 10 |
1 files changed, 6 insertions, 4 deletions
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 @@ 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 + desktopdir = $(datadir)/applications desktop_DATA = desktop_DATA_in = $(desktop_DATA_in_in:.in.in=.in) @@ -62,18 +64,18 @@ libavahi_ui_gtk3_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBAVAHI_UI_VERSION 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 |