define interfacesdir unconditionally

[catta] / avahi-discover-standalone / Makefile.am

diff --git a/avahi-discover-standalone/Makefile.am b/avahi-discover-standalone/Makefile.am
index 7145e0f7ba6723ff7bddae49fbd940f5c5de957a..18fbdde6aa2374a5873f0af261a12bbed0cd27c0 100644 (file)
--- a/avahi-discover-standalone/Makefile.am
+++ b/avahi-discover-standalone/Makefile.am
@@ -17,14 +17,17 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 
-AM_CFLAGS=\
-       -I$(top_srcdir) \
-       -DAVAHI_INTERFACES_DIR=\"$(interfacesdir)\"
+AM_CFLAGS=-I$(top_srcdir)
+
+interfaces = \
+        avahi-discover.glade
 
 # This cool debug trap works on i386/gcc only
 AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 
 if HAVE_GTK
+
+
 bin_PROGRAMS = \
        avahi-discover-standalone
 
@@ -33,7 +36,8 @@ avahi_discover_standalone_SOURCES = \
 
 avahi_discover_standalone_CFLAGS = \
        $(AM_CFLAGS) \
-       $(GLIB20_CFLAGS) $(GTK20_CFLAGS) $(GLADE20_CFLAGS)
+       $(GLIB20_CFLAGS) $(GTK20_CFLAGS) $(GLADE20_CFLAGS)\
+       -DAVAHI_INTERFACES_DIR=\"$(interfacesdir)\"
 
 avahi_discover_standalone_LDADD = \
        $(AM_LDADD) \
@@ -42,12 +46,22 @@ avahi_discover_standalone_LDADD = \
        ../avahi-core/libavahi-core.la  \
        $(GLIB20_LIBS) $(GTK20_LIBS) $(GLADE20_LIBS)
 
-interfaces = \
-        avahi-discover.glade
+interfacesdir=${datadir}/${PACKAGE}/interfaces/
+interfaces_DATA = $(interfaces)
+
+else 
 
+if HAVE_PYTHON 
+if HAVE_DBUS
+
+# We need this for the python version of avahi-discover
+interfacesdir=${datadir}/${PACKAGE}/interfaces/
 interfaces_DATA = $(interfaces)
 
+endif
+endif
+endif
+
 EXTRA_DIST = \
        $(interfaces) \
        avahi-discover.gladep
-endif