Browse Source

[3414] Move DHCP libexec binaries to sbin folder.

Marcin Siodelski 10 years ago
parent
commit
1e66d0a08c

+ 1 - 3
src/bin/d2/Makefile.am

@@ -14,8 +14,6 @@ if USE_STATIC_LINK
 AM_LDFLAGS = -static
 endif
 
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-
 CLEANFILES  = *.gcno *.gcda spec_config.h d2_messages.h d2_messages.cc s-messages
 
 man_MANS = kea-dhcp-ddns.8
@@ -47,7 +45,7 @@ s-messages: d2_messages.mes
 
 BUILT_SOURCES = spec_config.h d2_messages.h d2_messages.cc
 
-pkglibexec_PROGRAMS = kea-dhcp-ddns
+sbin_PROGRAMS = kea-dhcp-ddns
 
 kea_dhcp_ddns_SOURCES  = main.cc
 kea_dhcp_ddns_SOURCES += d_process.h

+ 1 - 3
src/bin/dhcp4/Makefile.am

@@ -14,8 +14,6 @@ if USE_STATIC_LINK
 AM_LDFLAGS = -static
 endif
 
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-
 CLEANFILES  = *.gcno *.gcda spec_config.h dhcp4_messages.h dhcp4_messages.cc s-messages
 
 man_MANS = kea-dhcp4.8
@@ -47,7 +45,7 @@ s-messages: dhcp4_messages.mes
 
 BUILT_SOURCES = spec_config.h dhcp4_messages.h dhcp4_messages.cc
 
-pkglibexec_PROGRAMS = kea-dhcp4
+sbin_PROGRAMS = kea-dhcp4
 
 kea_dhcp4_SOURCES  = main.cc
 kea_dhcp4_SOURCES += ctrl_dhcp4_srv.cc ctrl_dhcp4_srv.h

+ 1 - 3
src/bin/dhcp6/Makefile.am

@@ -15,8 +15,6 @@ if USE_STATIC_LINK
 AM_LDFLAGS = -static
 endif
 
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-
 CLEANFILES = spec_config.h dhcp6_messages.h dhcp6_messages.cc s-messages
 
 man_MANS = kea-dhcp6.8
@@ -49,7 +47,7 @@ s-messages: dhcp6_messages.mes
 
 BUILT_SOURCES = spec_config.h dhcp6_messages.h dhcp6_messages.cc
 
-pkglibexec_PROGRAMS = kea-dhcp6
+sbin_PROGRAMS = kea-dhcp6
 
 kea_dhcp6_SOURCES  = main.cc
 kea_dhcp6_SOURCES += dhcp6_log.cc dhcp6_log.h

+ 3 - 3
src/bin/keactrl/keactrl.conf.in

@@ -10,9 +10,9 @@ kea_config_file=@sysconfdir@/@PACKAGE@/kea.conf
 
 # Location of Kea binaries.
 exec_prefix=@exec_prefix@
-dhcp4_srv=@libexecdir@/@PACKAGE@/kea-dhcp4
-dhcp6_srv=@libexecdir@/@PACKAGE@/kea-dhcp6
-dhcp_ddns_srv=@libexecdir@/@PACKAGE@/kea-dhcp-ddns
+dhcp4_srv=@sbindir@/kea-dhcp4
+dhcp6_srv=@sbindir@/kea-dhcp6
+dhcp_ddns_srv=@sbindir@/kea-dhcp-ddns
 
 # Start DHCPv4 server?
 dhcp4=yes