[#3504] fix Kea not being able to find exec paths in custom sbindir

diff --git a/src/lib/dhcpsrv/Makefile.am b/src/lib/dhcpsrv/Makefile.am
index 469a2c4efcddcb287e093406b6ba765dfcc65fdb..e56ed12bced196b60390a0e2c3420a9f7130ec67 100644 (file)
--- a/src/lib/dhcpsrv/Makefile.am
+++ b/src/lib/dhcpsrv/Makefile.am
@@ -5,7 +5,7 @@ SUBDIRS = . testutils tests
 # DATA_DIR is the directory where to put default CSV files and the DHCPv6
 # server ID file (i.e. the file where the server finds its DUID at startup).
 dhcp_data_dir = @localstatedir@/lib/@PACKAGE@
-kea_lfc_location = @prefix@/sbin/kea-lfc
+kea_lfc_location = @sbindir@/kea-lfc
 
 AM_CPPFLAGS = -I$(top_builddir)/src/lib -I$(top_srcdir)/src/lib
 AM_CPPFLAGS += -DDHCP_DATA_DIR="\"$(dhcp_data_dir)\""

diff --git a/src/lib/mysql/Makefile.am b/src/lib/mysql/Makefile.am
index 03009d4376b454f5dd89385dc48419d8ba1af431..1004438f0a1c1f68bb7d2a37bb7686ad70c54bff 100644 (file)
--- a/src/lib/mysql/Makefile.am
+++ b/src/lib/mysql/Makefile.am
@@ -1,7 +1,7 @@
 SUBDIRS = . testutils tests
 
 AM_CPPFLAGS  =
-AM_CPPFLAGS += -DKEA_ADMIN=\"@prefix@/sbin/kea-admin\"
+AM_CPPFLAGS += -DKEA_ADMIN=\"@sbindir@/kea-admin\"
 AM_CPPFLAGS += -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
 AM_CPPFLAGS += $(BOOST_INCLUDES) $(MYSQL_CPPFLAGS)
 

diff --git a/src/lib/pgsql/Makefile.am b/src/lib/pgsql/Makefile.am
index 794a933eeaab3435e17c56621eb3470297be3cb0..e11b3292a2bf5564bbcf58c3cd299cbe19a99fa3 100644 (file)
--- a/src/lib/pgsql/Makefile.am
+++ b/src/lib/pgsql/Makefile.am
@@ -1,7 +1,7 @@
 SUBDIRS = . testutils tests
 
 AM_CPPFLAGS  =
-AM_CPPFLAGS += -DKEA_ADMIN=\"@prefix@/sbin/kea-admin\"
+AM_CPPFLAGS += -DKEA_ADMIN=\"@sbindir@/kea-admin\"
 AM_CPPFLAGS += -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
 AM_CPPFLAGS += $(BOOST_INCLUDES) $(PGSQL_CPPFLAGS)