From d5c98a226772fb01b5efd83645f3ed120c871002 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 22 Mar 2011 12:08:46 +0000 Subject: [PATCH] Rename dbus_daemondir to dbus_daemon_execdir so it's installed by install-exec --- bus/Makefile.am | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bus/Makefile.am b/bus/Makefile.am index 4c07769..5cba22b 100644 --- a/bus/Makefile.am +++ b/bus/Makefile.am @@ -1,5 +1,5 @@ configdir=$(sysconfdir)/dbus-1 -dbus_daemondir = $(DBUS_DAEMONDIR) +dbus_daemon_execdir = $(DBUS_DAEMONDIR) INCLUDES=-I$(top_srcdir) $(DBUS_BUS_CFLAGS) @PIE_CFLAGS@ \ -DDBUS_SYSTEM_CONFIG_FILE=\""$(configdir)/system.conf"\" \ @@ -148,7 +148,7 @@ bus_test_launch_helper_CPPFLAGS= -DDBUS_STATIC_BUILD \ ## we use noinst_PROGRAMS not check_PROGRAMS so that we build ## even when not doing "make check" noinst_PROGRAMS = $(TESTS) -dbus_daemon_PROGRAMS = dbus-daemon +dbus_daemon_exec_PROGRAMS = dbus-daemon libexec_PROGRAMS = dbus-daemon-launch-helper ## note that TESTS has special meaning (stuff to use in make check) -- 1.7.4.1