* tools/Makefile.am: use @EXPANDED_DATADIR@ instead of @DATADIRNAME@

This commit is contained in:
John (J5) Palmieri 2006-09-18 17:17:41 +00:00
parent 1ececca7e1
commit 5f292c611f
4 changed files with 12 additions and 1 deletions

View file

@ -1,3 +1,7 @@
2006-09-18 John (J5) Palmieri <johnp@redhat.com>
* tools/Makefile.am: use @EXPANDED_DATADIR@ instead of @DATADIRNAME@
2006-09-17 Havoc Pennington <hp@redhat.com>
* dbus/dbus-transport.c (_dbus_transport_get_is_authenticated):

View file

@ -551,6 +551,9 @@ dnl check for writev header and writev function so we're
dnl good to go if HAVE_WRITEV gets defined.
AC_CHECK_HEADERS(sys/uio.h, [AC_CHECK_FUNCS(writev)])
dnl needed on darwin for NAME_MAX
AC_CHECK_HEADERS(sys/syslimits.h)
dnl check for flavours of varargs macros (test from GLib)
AC_MSG_CHECKING(for ISO C99 varargs macros in C)
AC_TRY_COMPILE([],[

View file

@ -44,6 +44,10 @@
#include <dirent.h>
#include <sys/un.h>
#ifdef HAVE_SYS_SYSLIMITS_H
#include <sys/syslimits.h>
#endif
#ifndef O_BINARY
#define O_BINARY 0
#endif

View file

@ -1,4 +1,4 @@
INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_X_CFLAGS) -DDBUS_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" -DDBUS_COMPILATION -DDBUS_DAEMONDIR=\"@DBUS_DAEMONDIR@\"
INCLUDES=-I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_X_CFLAGS) -DDBUS_LOCALEDIR=\"@EXPANDED_DATADIR@/locale\" -DDBUS_COMPILATION -DDBUS_DAEMONDIR=\"@DBUS_DAEMONDIR@\"
bin_PROGRAMS=dbus-send dbus-monitor dbus-launch dbus-cleanup-sockets