diff options
| author | Lennart Poettering <lennart@poettering.net> | 2005-09-08 12:20:09 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2005-09-08 12:20:09 +0000 |
| commit | ceb0e9416ca364fc7b6c5b9e3267e07dd1e80718 (patch) | |
| tree | dff0eda42cb2d9d252aefe5bacd430c67c3e1340 | |
| parent | 50be1d3adfb0d0c378b3464a99690441ab1e5f14 (diff) | |
define interfacesdir unconditionally
git-svn-id: file:///home/lennart/svn/public/avahi/trunk@529 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
| -rw-r--r-- | avahi-discover-standalone/Makefile.am | 11 | ||||
| -rw-r--r-- | configure.ac | 3 |
2 files changed, 7 insertions, 7 deletions
diff --git a/avahi-discover-standalone/Makefile.am b/avahi-discover-standalone/Makefile.am index 2f3a4a1..18fbdde 100644 --- 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 4224712..83e12a2 100644 --- 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") |