strip glib usage from avahi-dnsconfd

[catta] / avahi-dnsconfd / Makefile.am

diff --git a/avahi-dnsconfd/Makefile.am b/avahi-dnsconfd/Makefile.am
index 7a2185f1cc7d6199a502b30dc3622c8a33f0c0bd..4f75ececb729a906abd96a3fe1f7c8ae56701808 100644 (file)
--- a/avahi-dnsconfd/Makefile.am
+++ b/avahi-dnsconfd/Makefile.am
@@ -21,20 +21,18 @@ pkgsysconfdir=$(sysconfdir)/avahi
 
 AM_CFLAGS= \
        -I$(top_srcdir) \
-       -DAVAHI_DNSCONF_SCRIPT=\"$(pkgsysconfdir)/dnsconf.action\"
-
-# GLIB 2.0
-AM_CFLAGS+=$(GLIB20_CFLAGS)
-AM_LDADD=$(GLIB20_LIBS)
+       -DAVAHI_RUNTIME_DIR=\"$(avahi_runtime_dir)/\" \
+       -DAVAHI_SOCKET=\"$(avahi_socket)\" \
+       -DAVAHI_DNSCONF_SCRIPT=\"$(pkgsysconfdir)/avahi-dnsconfd.action\"
 
 # libdaemon
 AM_CFLAGS+=$(LIBDAEMON_CFLAGS)
-AM_LDADD+=$(LIBDAEMON_LIBS)
+AM_LDADD=$(LIBDAEMON_LIBS)
 
 # This cool debug trap works on i386/gcc only
 AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 
-bin_PROGRAMS = \
+sbin_PROGRAMS = \
        avahi-dnsconfd
 
 avahi_dnsconfd_SOURCES = \
@@ -43,6 +41,6 @@ avahi_dnsconfd_SOURCES = \
 avahi_dnsconfd_CFLAGS = $(AM_CFLAGS)
 avahi_dnsconfd_LDADD = $(AM_LDADD) ../avahi-common/libavahi-common.la
 
-pkgsysconf_DATA=dnsconf.action
+pkgsysconf_SCRIPTS=avahi-dnsconfd.action
 
-EXTRA_DIST=dnsconf.action
+EXTRA_DIST=avahi-dnsconfd.action