define interfacesdir unconditionally

git-svn-id: file:///home/lennart/svn/public/avahi/trunk@529 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe

diff --git a/avahi-discover-standalone/Makefile.am b/avahi-discover-standalone/Makefile.am
index 2f3a4a11ad27c1c5a2155cb6cd218e7d536c640a..18fbdde6aa2374a5873f0af261a12bbed0cd27c0 100644 (file)
--- a/avahi-discover-standalone/Makefile.am
+++ b/avahi-discover-standalone/Makefile.am
@@ -17,9 +17,7 @@
 # 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
@@ -28,6 +26,8 @@ interfaces = \
 AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
 
 if HAVE_GTK
+
+
 bin_PROGRAMS = \
        avahi-discover-standalone
 
@@ -36,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) \
@@ -45,6 +46,7 @@ avahi_discover_standalone_LDADD = \
        ../avahi-core/libavahi-core.la  \
        $(GLIB20_LIBS) $(GTK20_LIBS) $(GLADE20_LIBS)
 
+interfacesdir=${datadir}/${PACKAGE}/interfaces/
 interfaces_DATA = $(interfaces)
 
 else 
@@ -53,6 +55,7 @@ if HAVE_PYTHON
 if HAVE_DBUS
 
 # We need this for the python version of avahi-discover
+interfacesdir=${datadir}/${PACKAGE}/interfaces/
 interfaces_DATA = $(interfaces)
 
 endif

diff --git a/configure.ac b/configure.ac
index 4224712e1dcab8c06e947ed60159e42ace6780db..83e12a2a04f3433efd86022c9e55db734f23f64a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -248,9 +248,6 @@ if test "x$HAVE_GTK" = "xyes" ; then
         PKG_CHECK_MODULES(GLADE20, [ libglade-2.0 >= 2.4.0 ])
         AC_SUBST(GLADE20_CFLAGS)
         AC_SUBST(GLADE20_LIBS)
-
-        interfacesdir="${datadir}/${PACKAGE}/interfaces/"
-        AC_SUBST(interfacesdir)
 fi
 AM_CONDITIONAL(HAVE_GTK, test "x$HAVE_GTK" = "xyes")